From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:19:19 +0000 (-0700)
Subject: Meta/Reintegrate: guard for misspelt topic name
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0867ec58f1a055f706996d0bf8375b80e1de8bc;p=thirdparty%2Fgit.git

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.
---

diff --git a/Reintegrate b/Reintegrate
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