diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-04-07 14:59:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-07 14:59:27 -0700 |
| commit | f1edda9bfb70ce5eec41c68c51841faef551cb10 (patch) | |
| tree | 727b6faef0856456a6f138bd5e7ab54be3f7c273 /gpg-interface.c | |
| parent | 1678b7de977043f31242d2029259797eee620236 (diff) | |
| parent | ddd7c7ab12a25850e96f550567ef06fb9bea0cc0 (diff) | |
| download | git-f1edda9bfb70ce5eec41c68c51841faef551cb10.tar.xz | |
Merge branch 'jt/fast-import-signed-modes'
Handling of signed commits and tags in fast-import has been made more
configurable.
* jt/fast-import-signed-modes:
fast-import: add 'abort-if-invalid' mode to '--signed-tags=<mode>'
fast-import: add 'sign-if-invalid' mode to '--signed-tags=<mode>'
fast-import: add 'strip-if-invalid' mode to '--signed-tags=<mode>'
fast-import: add 'abort-if-invalid' mode to '--signed-commits=<mode>'
fast-export: check for unsupported signing modes earlier
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 d517425034..dafd5371fa 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -1164,6 +1164,8 @@ int parse_sign_mode(const char *arg, enum sign_mode *mode, const char **keyid) *mode = SIGN_WARN_STRIP; } else if (!strcmp(arg, "strip")) { *mode = SIGN_STRIP; + } else if (!strcmp(arg, "abort-if-invalid")) { + *mode = SIGN_ABORT_IF_INVALID; } else if (!strcmp(arg, "strip-if-invalid")) { *mode = SIGN_STRIP_IF_INVALID; } else if (!strcmp(arg, "sign-if-invalid")) { |