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
@@ -175,7 +175,6 @@ no)
175
original_branch=
176
into=
177
fi
178
-
178
}
179
180
leave () {
@@ -327,8 +326,8 @@ show_merge () {
326
merge_hier=
327
;;
328
*)
330
- echo 2>&1 "Huh?: $msg"
331
- return
329
+ echo >&2 "unknown merge: $msg"
330
+ exit 1
331
;;
332
esac &&
333
tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&