mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 2.3.10

Browse Source
This commit is contained in:
Junio C Hamano
2015-09-28 15:28:26 -07:00
parent 74b6763816 18b58f707f
commit 6343e2f6f2
27 changed files with 446 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
combine-diff.c
View File

@ -419,8 +419,10 @@ static void combine_diff(const unsigned char *parent, unsigned int mode,
state.num_parent = num_parent;
state.n = n;
xdi_diff_outf(&parent_file, result_file, consume_line, &state,
&xpp, &xecfg);
if (xdi_diff_outf(&parent_file, result_file, consume_line, &state,
&xpp, &xecfg))
die("unable to generate combined diff for %s",
sha1_to_hex(parent));
free(parent_file.ptr);
/* Assign line numbers for this parent.