diff options
| author | Jerry Zhang <jerry@skydio.com> | 2022-10-24 20:07:40 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-24 15:44:19 -0700 |
| commit | 51276c1832d64d3b8f4dfc06c3ef21bf74f1916e (patch) | |
| tree | 1f091339b7733c7c1fa6f7fedf30973467c50a91 /builtin/log.c | |
| parent | patch-id: fix stable patch id for binary / header-only (diff) | |
| download | git-51276c1832d64d3b8f4dfc06c3ef21bf74f1916e.tar.gz 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 '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 88a5e98875..306103f302 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1694,7 +1694,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, 1)) + if (commit_patch_id(commit, &diffopt, &oid, 0)) 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; |