development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

diff-files -c/--cc: combine only when both ours and theirs exist.

Browse source 
The previous round forgot to make sure there actually are two
versions to compare against the working tree version.  Otherwise
using -c/--cc would not make much sense.

Also plug a small memory leak.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-01-28 02:09:08 -08:00
parent addafaf92e
commit 939aabbf7d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
diff-files.c
View file

@ -121,6 +121,7 @@ int main(int argc, const char **argv)
struct combine_diff_path p;
unsigned char fill[4][20];
} combine;
int num_compare_stages = 0;
combine.p.next = NULL;
combine.p.len = ce_namelen(ce);
@ -140,9 +141,11 @@ int main(int argc, const char **argv)
* stage #3 (theirs) is the second.
*/
stage = ce_stage(nce);
if (2 <= stage)
if (2 <= stage) {
num_compare_stages++;
memcpy(combine.p.parent_sha1[stage-2],
nce->sha1, 20);
}
/* diff against the proper unmerged stage */
if (stage == diff_unmerged_stage)
@ -154,12 +157,14 @@ int main(int argc, const char **argv)
*/
i--;
if (combine_merges) {
if (combine_merges && num_compare_stages == 2) {
show_combined_diff(&combine.p, 2,
dense_combined_merges,
NULL, 0);
free(combine.p.path);
continue;
}
free(combine.p.path);
/*
* Show the diff for the 'ce' if we found the one