summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2020-02-22 20:17:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-24 17:33:30 (GMT)
commit42d4e1d1128fa1cb56032ac58f65ea3dd1296a9a (patch)
treefe7a1954c437e62ebe0a5bb7f0f82ff8fb70c114 /builtin/commit.c
parente02a7141f83326f7098800fed764061ecf1f0eff (diff)
downloadgit-42d4e1d1128fa1cb56032ac58f65ea3dd1296a9a.zip
git-42d4e1d1128fa1cb56032ac58f65ea3dd1296a9a.tar.gz
git-42d4e1d1128fa1cb56032ac58f65ea3dd1296a9a.tar.bz2
commit: use expected signature header for SHA-256
The transition plan anticipates that we will allow signatures using multiple algorithms in a single commit. In order to do so, we need to use a different header per algorithm so that it will be obvious over which data to compute the signature. The transition plan specifies that we should use "gpgsig-sha256", so wire up the commit code such that it can write and parse the current algorithm, and it can remove the headers for any algorithm when creating a new commit. Add tests to ensure that we write using the right header and that git fsck doesn't reject these commits. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 7ba33a3..798d362 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1659,7 +1659,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
}
if (amend) {
- const char *exclude_gpgsig[2] = { "gpgsig", NULL };
+ const char *exclude_gpgsig[3] = { "gpgsig", "gpgsig-sha256", NULL };
extra = read_commit_extra_headers(current_head, exclude_gpgsig);
} else {
struct commit_extra_header **tail = &extra;