diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-28 14:59:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 14:59:28 -0700 |
| commit | 92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94 (patch) | |
| tree | 1ee5bd8057292fc6dfa9edc58b3c2cc7b990f8ab /combine-diff.c | |
| parent | Merge branch 'jk/transfer-limit-redirection' into maint-2.3 (diff) | |
| parent | merge-file: enforce MAX_XDIFF_SIZE on incoming files (diff) | |
| download | tgif-92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94.tar.xz | |
Merge branch 'jk/xdiff-memory-limits' into maint-2.3
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 91edce58e1..284bec6ad5 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -419,8 +419,10 @@ static void combine_diff(const unsigned char *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", + sha1_to_hex(parent)); free(parent_file.ptr); /* Assign line numbers for this parent. |