diff options
| author | Jerry Zhang <jerry@skydio.com> | 2022-10-24 22:07:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-25 00:44:19 +0200 |
| commit | 51276c1832d64d3b8f4dfc06c3ef21bf74f1916e (patch) | |
| tree | 1f091339b7733c7c1fa6f7fedf30973467c50a91 /diff.h | |
| parent | patch-id: fix stable patch id for binary / header-only (diff) | |
| download | git-51276c1832d64d3b8f4dfc06c3ef21bf74f1916e.tar.xz git-51276c1832d64d3b8f4dfc06c3ef21bf74f1916e.zip | |
patch-id: use stable patch-id for rebases
Git doesn't persist patch-ids during the rebase process, so there is
no need to specifically invoke the unstable variant. Use the stable
logic for all internal patch-id calculations to minimize the number of
code paths and improve test coverage.
Signed-off-by: Jerry Zhang <jerry@skydio.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -634,7 +634,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option); int run_diff_index(struct rev_info *revs, unsigned int option); int do_diff_cache(const struct object_id *, struct diff_options *); -int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); +int diff_flush_patch_id(struct diff_options *, struct object_id *, int); void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx); int diff_result_code(struct diff_options *, int); |