diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:33:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:33:56 -0700 |
| commit | 11a458befcd7662fbe6d2d53c76d49ae2b0fe219 (patch) | |
| tree | de4cf6a8a43cb30b53f924ed8820de09409f0afd /combine-diff.c | |
| parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
| parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
| download | git-11a458befcd7662fbe6d2d53c76d49ae2b0fe219.tar.gz | |
Sync with 2.4.10
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. |