path: root/combine-diff.c
diff options
authorJeff King <>2018-11-02 06:35:45 (GMT)
committerJunio C Hamano <>2018-11-02 11:43:02 (GMT)
commit9346d6d14dddc7989ba879839d58f6c2426cffbb (patch)
tree6255724677334f2267490a6a171f7073b17ea997 /combine-diff.c
parent611e42a5980a3a9f8bb3b1b49c1abde63c7a191e (diff)
xdiff-interface: provide a separate consume callback for hunks
The previous commit taught xdiff to optionally provide the hunk header data to a specialized callback. But most users of xdiff actually use our more convenient xdi_diff_outf() helper, which ensures that our callbacks are always fed whole lines. Let's plumb the special hunk-callback through this interface, too. It will follow the same rule as xdiff when the hunk callback is NULL (i.e., continue to pass a stringified hunk header to the line callback). Since we add NULL to each caller, there should be no behavior change yet. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'combine-diff.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c
index de7695e..195054b 100644
--- 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",