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 /diff.h | |
| 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 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -436,7 +436,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option); int run_diff_index(struct rev_info *revs, int cached); int do_diff_cache(const struct object_id *, struct diff_options *); -int diff_flush_patch_id(struct diff_options *, struct object_id *, int); +int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); +void flush_one_hunk(struct object_id *, git_SHA_CTX *); int diff_result_code(struct diff_options *, int); |