diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-04-26 23:51:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 10:27:43 (GMT) |
| commit | a8f6855f48fd474719e92eecc66c29a28fdc0f46 (patch) | |
| tree | 5ff4baed03ea6955b7f3c6b1b0f89b862e2f61c5 /builtin/log.c | |
| parent | 6f93d261fa8ca6a84c2e03e20558c0ddca3c05c3 (diff) | |
| download | git-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 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index e43ee12..147850d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1435,7 +1435,7 @@ static void prepare_bases(struct base_tree_info *bases, struct object_id *patch_id; if (*commit_base_at(&commit_base, commit)) continue; - if (commit_patch_id(commit, &diffopt, &oid, 0)) + if (commit_patch_id(commit, &diffopt, &oid, 0, 1)) die(_("cannot get patch id")); ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id); patch_id = bases->patch_id + bases->nr_patch_id; |