@matheusbsbs / matheus-bagliano / commits / 9969454435

diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"

The combined diff machinery can be used to compare: - a merge commit with its parent commits; - a working-tree file with multiple stages in an unmerged index; or - a working-tree file with the HEAD and the index. The internal function combine-diff.c:show_patch_diff() checked if it needs to read the "result" from the working tree by looking at the object name of the result --- if it is null_sha1, it read from the working tree. This mistook a merge that records a deletion as the conflict resolution as if it is a cue to read from the working tree. Pass this information explicitly from the caller instead. Noticed and reported by Johan Herland. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Aug 4, 2011 at 11:39 UTC 99694544358b74c14982f2b9769f8804f017672c

1 file changed +10 -4

combine-diff.c

+10 -4

@@ -682,7 +682,8 @@ static void dump_quoted_path(const char *head,

682 }

683

684 static void show_patch_diff(struct combine_diff_path *elem, int num_parent,

685 - int dense, struct rev_info *rev)

685 + int dense, int working_tree_file,

686 + struct rev_info *rev)

687 {

688 struct diff_options *opt = &rev->diffopt;

689 unsigned long result_size, cnt, lno;

@@ -691,7 +692,6 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,

692 struct sline *sline; /* survived lines */

693 int mode_differs = 0;

694 int i, show_hunks;

694 - int working_tree_file = is_null_sha1(elem->sha1);

695 int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV;

696 const char *a_prefix, *b_prefix;

697 mmfile_t result_file;

@@ -954,6 +954,12 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re

954 write_name_quoted(p->path, stdout, line_termination);

955 }

956

957 +/*

958 + * The result (p->elem) is from the working tree and their

959 + * parents are typically from multiple stages during a merge

960 + * (i.e. diff-files) or the state in HEAD and in the index

961 + * (i.e. diff-index).

962 + */

963 void show_combined_diff(struct combine_diff_path *p,

964 int num_parent,

965 int dense,

@@ -967,7 +973,7 @@ void show_combined_diff(struct combine_diff_path *p,

973 DIFF_FORMAT_NAME_STATUS))

974 show_raw_diff(p, num_parent, rev);

975 else if (opt->output_format & DIFF_FORMAT_PATCH)

970 - show_patch_diff(p, num_parent, dense, rev);

976 + show_patch_diff(p, num_parent, dense, 1, rev);

977 }

978

979 void diff_tree_combined(const unsigned char *sha1,

@@ -1035,7 +1041,7 @@ void diff_tree_combined(const unsigned char *sha1,

1041 for (p = paths; p; p = p->next) {

1042 if (p->len)

1043 show_patch_diff(p, num_parent, dense,

1038 - rev);

1044 + 0, rev);

1045 }

1046 }

1047 }