diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
| commit | 3adc4ec7b9e1d2118501728a75a5b93d971974fa (patch) | |
| tree | 807d65746060e9967d6d016b230730ef5fd24334 /combine-diff.c | |
| parent | be08dee9738eaaa0423885ed189c2b6ad8368cf0 (diff) | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| download | git-3adc4ec7b9e1d2118501728a75a5b93d971974fa.tar.gz git-3adc4ec7b9e1d2118501728a75a5b93d971974fa.tar.xz | |
Sync with v2.5.4
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 30c7eb6d3..0f62f54b5 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. |