diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-09 07:54:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-09 07:54:54 +0900 |
| commit | c64b234a0bcff8b616eb658a4a245f8a25cb2bac (patch) | |
| tree | 3c2040db18357aaaeaa81d29305545e284bf2026 | |
| parent | bdc5341ff65278a3cc80b2e8a02a2f02aa1fac06 (diff) | |
| parent | 9f3a11508719a244fa52d5418bfd29847a272211 (diff) | |
| download | git-c64b234a0bcff8b616eb658a4a245f8a25cb2bac.tar.xz | |
Merge branch 'pw/replay-exclude-gpgsig-fix'
"git replay" forgot to omit the "gpgsig-sha256" extended header
from the resulting commit the same way it omits "gpgsig", which has
been corrected.
* pw/replay-exclude-gpgsig-fix:
replay: do not copy "gpgsign-sha256" header
| -rw-r--r-- | builtin/replay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/replay.c b/builtin/replay.c index 6606a2c94b..1f9ffd2b3e 100644 --- a/builtin/replay.c +++ b/builtin/replay.c @@ -73,7 +73,7 @@ static struct commit *create_commit(struct repository *repo, const char *message = repo_logmsg_reencode(repo, based_on, NULL, out_enc); const char *orig_message = NULL; - const char *exclude_gpgsig[] = { "gpgsig", NULL }; + const char *exclude_gpgsig[] = { "gpgsig", "gpgsig-sha256", NULL }; commit_list_insert(parent, &parents); extra = read_commit_extra_headers(based_on, exclude_gpgsig); |