Meta/Reintegrate: die on, instead of silently ignore, an unknown merge
Junio C Hamano committed
May 11, 2026 at 10:55 UTC
cc67b9db21727da8635214205c0d23d977235dcf
1 file changed
+2
-3
Reintegrate
+2
-3
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) &&