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

Sync with 2.4.10

Browse Source
This commit is contained in:
Junio C Hamano
2015-09-28 15:33:56 -07:00
parent ee6ad5f4d5 a2558fb8e1
commit 11a458befc
28 changed files with 466 additions and 29 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 struct object_id *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",
oid_to_hex(parent));
free(parent_file.ptr);
/* Assign line numbers for this parent.