From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2026 01:55:30 +0000 (+0900)
Subject: Meta/Reintegrate: die on, instead of silently ignore, an unknown merge
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=cc67b9db21727da8635214205c0d23d977235dcf;p=thirdparty%2Fgit.git

Meta/Reintegrate: die on, instead of silently ignore, an unknown merge
---

diff --git a/Reintegrate b/Reintegrate
index a1e67a0330..aff76f6d96 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -175,7 +175,6 @@ no)
 			original_branch=
 			into=
 		fi
-
 	}
 
 	leave () {
@@ -327,8 +326,8 @@ show_merge () {
 		merge_hier=
 		;;
 	*)
-		echo 2>&1 "Huh?: $msg"
-		return
+		echo >&2 "unknown merge: $msg"
+		exit 1
 		;;
 	esac &&
 	tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&