diff options
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. |