git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/5] fast-export: check for unsupported signing modes earlier

From
Justin Tobler <jltobler@gmail.com>
Date
Mar 26, 2026, 19:14 UTC
Message-ID
<20260326191414.3783974-2-jltobler@gmail.com>
In-Reply-To
<20260326191414.3783974-1-jltobler@gmail.com>

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>
---
 builtin/fast-export.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 13621b0d6a..a30fb90b6e 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -64,7 +64,8 @@ static int parse_opt_sign_mode(const struct option *opt,
 	if (unset)
 		return 0;
 
-	if (parse_sign_mode(arg, val, NULL))
+	if (parse_sign_mode(arg, val, NULL) || (*val == SIGN_STRIP_IF_INVALID) ||
+	    (*val == SIGN_SIGN_IF_INVALID))
 		return error(_("unknown %s mode: %s"), opt->long_name, arg);
 
 	return 0;
@@ -822,12 +823,6 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
 			die(_("encountered signed commit %s; use "
 			      "--signed-commits=<mode> to handle it"),
 			    oid_to_hex(&commit->object.oid));
-		case SIGN_STRIP_IF_INVALID:
-			die(_("'strip-if-invalid' is not a valid mode for "
-			      "git fast-export with --signed-commits=<mode>"));
-		case SIGN_SIGN_IF_INVALID:
-			die(_("'sign-if-invalid' is not a valid mode for "
-			      "git fast-export with --signed-commits=<mode>"));
 		default:
 			BUG("invalid signed_commit_mode value %d", signed_commit_mode);
 		}
@@ -970,12 +965,6 @@ static void handle_tag(const char *name, struct tag *tag)
 				die(_("encountered signed tag %s; use "
 				      "--signed-tags=<mode> to handle it"),
 				    oid_to_hex(&tag->object.oid));
-			case SIGN_STRIP_IF_INVALID:
-				die(_("'strip-if-invalid' is not a valid mode for "
-				      "git fast-export with --signed-tags=<mode>"));
-			case SIGN_SIGN_IF_INVALID:
-				die(_("'sign-if-invalid' is not a valid mode for "
-				      "git fast-export with --signed-tags=<mode>"));
 			default:
 				BUG("invalid signed_commit_mode value %d", signed_commit_mode);
 			}
-- 
2.53.0.381.g628a66ccf6
Previous: Justin ToblerNext: Justin Tobler
Message 2 of 8 in “fast-import: extend signed object handling modes”
  1. 0/5 fast-import: extend signed object handling modesJustin Tobler, Mar 26, 2026
  2. 1/5 fast-export: check for unsupported signing modes earlierJustin Tobler, Mar 26, 2026
  3. 2/5 fast-import: add 'abort-if-invalid' mode to '--signed-commits=<mode>'Justin Tobler, Mar 26, 2026
  4. 3/5 fast-import: add 'strip-if-invalid' mode to '--signed-tags=<mode>'Justin Tobler, Mar 26, 2026
  5. 4/5 fast-import: add 'sign-if-invalid' mode to '--signed-tags=<mode>'Justin Tobler, Mar 26, 2026
  6. 5/5 fast-import: add 'abort-if-invalid' mode to '--signed-tags=<mode>'Justin Tobler, Mar 26, 2026
  7. Junio C HamanoMar 31, 2026
  8. Justin ToblerMar 31, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.