setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..

diff --git a/combine-diff.c b/combine-diff.c
index 30c7eb6d3cddbdf17d6ca8ff3bc85267041d1669..0f62f54b5ef4bb4ec81cff5aead2d6cd66da194e 100644 (file)
--- 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.