diff: discard hunk headers for patch-ids earlier

diff --git a/combine-diff.c b/combine-diff.c
index de7695e72824f6f041e0979e29302ded6e50d611..195054b87abc244f4026a9c0008d0bdc99696d92 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -419,8 +419,8 @@ static void combine_diff(const struct object_id *parent, unsigned int mode,
        state.num_parent = num_parent;
        state.n = n;
 
-       if (xdi_diff_outf(&parent_file, result_file, consume_line, &state,
-                         &xpp, &xecfg))
+       if (xdi_diff_outf(&parent_file, result_file, NULL, consume_line,
+                         &state, &xpp, &xecfg))
                die("unable to generate combined diff for %s",
                    oid_to_hex(parent));
        free(parent_file.ptr);