path: root/patch-ids.h
diff options
authorStephen Boyd <>2019-04-26 23:51:57 (GMT)
committerJunio C Hamano <>2019-05-08 10:27:43 (GMT)
commita8f6855f48fd474719e92eecc66c29a28fdc0f46 (patch)
tree5ff4baed03ea6955b7f3c6b1b0f89b862e2f61c5 /patch-ids.h
parent6f93d261fa8ca6a84c2e03e20558c0ddca3c05c3 (diff)
format-patch: make --base patch-id output stable
We weren't flushing the context each time we processed a hunk in the patch-id generation code in diff.c, but we were doing that when we generated "stable" patch-ids with the 'patch-id' tool. Let's port that similar logic over from patch-id.c into diff.c so we can get the same hash when we're generating patch-ids for 'format-patch --base=' types of command invocations. Cc: Xiaolong Ye <> Signed-off-by: Stephen Boyd <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'patch-ids.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/patch-ids.h b/patch-ids.h
index 82a12b6..03bb04e 100644
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -20,7 +20,7 @@ struct patch_ids {
int commit_patch_id(struct commit *commit, struct diff_options *options,
- struct object_id *oid, int);
+ struct object_id *oid, int, int);
int init_patch_ids(struct repository *, struct patch_ids *);
int free_patch_ids(struct patch_ids *);
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);