From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Dec 2025 05:49:58 +0000 (+0900)
Subject: Merge branch 'cc/fast-import-strip-if-invalid'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b40ddc1a5e2eecd54802c3c6c3c940b0306542a;p=thirdparty%2Fgit.git

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()
---

1b40ddc1a5e2eecd54802c3c6c3c940b0306542a
diff --cc builtin/fast-export.c
index 0421360ab7,a839a8f9ac..b90da5e616
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@@ -797,12 -797,10 +797,9 @@@ static void handle_commit(struct commi
  	       (int)(committer_end - committer), committer);
  	if (signatures.nr) {
  		switch (signed_commit_mode) {
- 		case SIGN_ABORT:
- 			die(_("encountered signed commit %s; use "
- 			      "--signed-commits=<mode> to handle it"),
- 			    oid_to_hex(&commit->object.oid));
 -
+ 		/* Exporting modes */
  		case SIGN_WARN_VERBATIM:
 -			warning("exporting %"PRIuMAX" signature(s) for commit %s",
 +			warning(_("exporting %"PRIuMAX" signature(s) for commit %s"),
  				(uintmax_t)signatures.nr, oid_to_hex(&commit->object.oid));
  			/* fallthru */
  		case SIGN_VERBATIM:
@@@ -811,8 -809,10 +808,10 @@@
  				print_signature(item->string, item->util);
  			}
  			break;
+ 
+ 		/* Stripping modes */
  		case SIGN_WARN_STRIP:
 -			warning("stripping signature(s) from commit %s",
 +			warning(_("stripping signature(s) from commit %s"),
  				oid_to_hex(&commit->object.oid));
  			/* fallthru */
  		case SIGN_STRIP:
@@@ -935,18 -945,18 +945,17 @@@ static void handle_tag(const char *name
  		size_t sig_offset = parse_signed_buffer(message, message_size);
  		if (sig_offset < message_size)
  			switch (signed_tag_mode) {
- 			case SIGN_ABORT:
- 				die(_("encountered signed tag %s; use "
- 				      "--signed-tags=<mode> to handle it"),
- 				    oid_to_hex(&tag->object.oid));
 -
+ 			/* Exporting modes */
  			case SIGN_WARN_VERBATIM:
 -				warning("exporting signed tag %s",
 +				warning(_("exporting signed tag %s"),
  					oid_to_hex(&tag->object.oid));
  				/* fallthru */
  			case SIGN_VERBATIM:
  				break;
+ 
+ 			/* Stripping modes */
  			case SIGN_WARN_STRIP:
 -				warning("stripping signature from tag %s",
 +				warning(_("stripping signature from tag %s"),
  					oid_to_hex(&tag->object.oid));
  				/* fallthru */
  			case SIGN_STRIP: