summaryrefslogtreecommitdiff
path: root/patch-ids.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2019-04-26 23:51:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-08 10:27:43 (GMT)
commita8f6855f48fd474719e92eecc66c29a28fdc0f46 (patch)
tree5ff4baed03ea6955b7f3c6b1b0f89b862e2f61c5 /patch-ids.c
parent6f93d261fa8ca6a84c2e03e20558c0ddca3c05c3 (diff)
downloadgit-a8f6855f48fd474719e92eecc66c29a28fdc0f46.zip
git-a8f6855f48fd474719e92eecc66c29a28fdc0f46.tar.gz
git-a8f6855f48fd474719e92eecc66c29a28fdc0f46.tar.bz2
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 <xiaolong.ye@intel.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'patch-ids.c')
-rw-r--r--patch-ids.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/patch-ids.c b/patch-ids.c
index c262e1b..f70d396 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -11,7 +11,7 @@ static int patch_id_defined(struct commit *commit)
}
int commit_patch_id(struct commit *commit, struct diff_options *options,
- struct object_id *oid, int diff_header_only)
+ struct object_id *oid, int diff_header_only, int stable)
{
if (!patch_id_defined(commit))
return -1;
@@ -22,7 +22,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
else
diff_root_tree_oid(&commit->object.oid, "", options);
diffcore_std(options);
- return diff_flush_patch_id(options, oid, diff_header_only);
+ return diff_flush_patch_id(options, oid, diff_header_only, stable);
}
/*
@@ -46,11 +46,11 @@ static int patch_id_neq(const void *cmpfn_data,
struct patch_id *b = (void *)entry_or_key;
if (is_null_oid(&a->patch_id) &&
- commit_patch_id(a->commit, opt, &a->patch_id, 0))
+ commit_patch_id(a->commit, opt, &a->patch_id, 0, 0))
return error("Could not get patch ID for %s",
oid_to_hex(&a->commit->object.oid));
if (is_null_oid(&b->patch_id) &&
- commit_patch_id(b->commit, opt, &b->patch_id, 0))
+ commit_patch_id(b->commit, opt, &b->patch_id, 0, 0))
return error("Could not get patch ID for %s",
oid_to_hex(&b->commit->object.oid));
return !oideq(&a->patch_id, &b->patch_id);
@@ -80,7 +80,7 @@ static int init_patch_id_entry(struct patch_id *patch,
struct object_id header_only_patch_id;
patch->commit = commit;
- if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
+ if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
return -1;
hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));