diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-05 14:49:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-05 14:49:58 +0900 |
| commit | 1b40ddc1a5e2eecd54802c3c6c3c940b0306542a (patch) | |
| tree | ce1c454b13334bc0c46be46b37169a8ccc1ebf91 /gpg-interface.c | |
| parent | 85f99338e107a36650257787a350821acc36a81d (diff) | |
| parent | c20f112e5149d1bd0d4741c4b28a65f81318309a (diff) | |
| download | git-1b40ddc1a5e2eecd54802c3c6c3c940b0306542a.tar.gz | |
Merge branch 'cc/fast-import-strip-if-invalid'
"git fast-import" learns "--strip-if-invalid" option to drop
invalid cryptographic signature from objects.
* cc/fast-import-strip-if-invalid:
fast-import: add 'strip-if-invalid' mode to --signed-commits=<mode>
commit: refactor verify_commit_buffer()
fast-import: refactor finalize_commit_buffer()
Diffstat (limited to 'gpg-interface.c')
| -rw-r--r-- | gpg-interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gpg-interface.c b/gpg-interface.c index 3e73513694..47222bf31b 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -1154,6 +1154,8 @@ int parse_sign_mode(const char *arg, enum sign_mode *mode) *mode = SIGN_WARN_STRIP; else if (!strcmp(arg, "strip")) *mode = SIGN_STRIP; + else if (!strcmp(arg, "strip-if-invalid")) + *mode = SIGN_STRIP_IF_INVALID; else return -1; return 0; |