diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-07 13:26:22 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-08 10:36:53 -0800 |
commit | ae8e4c9ce10ea9439a88b79a40aeff4696d40416 (patch) | |
tree | ba5ca6899912fda76ce6a9c21794242a356919e3 /t/lib-gpg | |
parent | fmt-merge-msg: Add contents of merged tag in the merge message (diff) | |
download | tgif-ae8e4c9ce10ea9439a88b79a40aeff4696d40416.tar.xz |
merge: make usage of commit->util more extensible
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: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-gpg')
0 files changed, 0 insertions, 0 deletions