Meta/Reintegrate: guard for misspelt topic name
Earlier the script just kept going, pretending that the failure from the "merge" was due to a conflicted change that rerere could take care of.
Junio C Hamano committed
Jul 19, 2013 at 10:19 UTC
c0867ec58f1a055f706996d0bf8375b80e1de8bc
1 file changed
+5
-3
Reintegrate
+5
-3
index 8052dda9af..0266e712f4 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -139,9 +139,11 @@ no)
"" | "#"*)
echo >&2 "* $branch"
- save=$(git rev-parse --verify HEAD)
- tip=$(git rev-parse --verify "$branch^0")
- mb=$(git merge-base "$tip" "$save")
+ save=$(git rev-parse --verify HEAD) &&
+ tip=$(git rev-parse --verify "$branch^0") &&
+ mb=$(git merge-base "$tip" "$save") ||
+ exit
+
test "$mb" = "$tip" && continue
mark_cut