• J
    merge: make usage of commit->util more extensible · ae8e4c9c
    Junio C Hamano 提交于
    The merge-recursive code uses the commit->util field directly to annotate
    the commit objects given from the command line, i.e. the remote heads to
    be merged, with a single string to be used to describe it in its trace
    messages and conflict markers.
    
    Correct this short-signtedness by redefining the field to be a pointer to
    a structure "struct merge_remote_desc" that later enhancements can add
    more information. Store the original objects we were told to merge in a
    field "obj" in this struct, so that we can recover the tag we were told to
    merge.
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    ae8e4c9c
merge-recursive.c 57.5 KB