fast-export: check for unsupported signing modes earlier
The '--signed-{commits,tags}' options for git-fast-export(1) support only a subset of the modes accepted by git-fast-import(1). Unsupported modes such as 'strip-if-invalid' and 'sign-if-invalid' are accepted during option parsing, but cause the command to die later when a signed object is encountered. Instead, reject unsupported signing modes immediately after parsing the option. This treats them the same as other unknown modes and avoids deferring the error until object processing. This also removes duplicated checks in commit/tag handling code. Signed-off-by: Justin Tobler <jltobler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Justin Tobler committed
Mar 26, 2026 at 14:14 UTC
6d35cc472e24394edb21a9b4d0abe25f5b2a91f2
1 file changed
+2
-13
builtin/fast-export.c
+2
-13
@@ -64,7 +64,8 @@ static int parse_opt_sign_mode(const struct option *opt,
64
if (unset)
65
return 0;
66
67
- if (parse_sign_mode(arg, val, NULL))
67
+ if (parse_sign_mode(arg, val, NULL) || (*val == SIGN_STRIP_IF_INVALID) ||
68
+ (*val == SIGN_SIGN_IF_INVALID))
69
return error(_("unknown %s mode: %s"), opt->long_name, arg);
70
71
return 0;
@@ -822,12 +823,6 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
823
die(_("encountered signed commit %s; use "
824
"--signed-commits=<mode> to handle it"),
825
oid_to_hex(&commit->object.oid));
825
- case SIGN_STRIP_IF_INVALID:
826
- die(_("'strip-if-invalid' is not a valid mode for "
827
- "git fast-export with --signed-commits=<mode>"));
828
- case SIGN_SIGN_IF_INVALID:
829
- die(_("'sign-if-invalid' is not a valid mode for "
830
- "git fast-export with --signed-commits=<mode>"));
826
default:
827
BUG("invalid signed_commit_mode value %d", signed_commit_mode);
828
}
@@ -970,12 +965,6 @@ static void handle_tag(const char *name, struct tag *tag)
965
die(_("encountered signed tag %s; use "
966
"--signed-tags=<mode> to handle it"),
967
oid_to_hex(&tag->object.oid));
973
- case SIGN_STRIP_IF_INVALID:
974
- die(_("'strip-if-invalid' is not a valid mode for "
975
- "git fast-export with --signed-tags=<mode>"));
976
- case SIGN_SIGN_IF_INVALID:
977
- die(_("'sign-if-invalid' is not a valid mode for "
978
- "git fast-export with --signed-tags=<mode>"));
968
default:
969
BUG("invalid signed_commit_mode value %d", signed_commit_mode);
970
}