diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:46:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 13:20:08 -0700 |
| commit | 590f6e4235a7d44ad39511186ca8bbac02ae8c2e (patch) | |
| tree | 6999a9512d87bbc06dfb3308fdc824e5226e7597 /combine-diff.c | |
| parent | e13d854322ad802213aea13409505c765b5c68d1 (diff) | |
| parent | 22f698cb188243b313e024d618283e0293e37140 (diff) | |
| download | git-590f6e4235a7d44ad39511186ca8bbac02ae8c2e.tar.gz | |
Sync with 2.6.1
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index 30c7eb6d3c..0f62f54b5e 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -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. |