admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit: use expected signature header for SHA-256

Browse Source 
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>
This commit is contained in:
brian m. carlson
2020-02-22 20:17:42 +00:00
committed by Junio C Hamano
parent e02a7141f8
commit 42d4e1d112
5 changed files with 62 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@@ -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;