]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: guard for misspelt topic name
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:19:19 +0000 (10:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:20:54 +0000 (10:20 -0700)
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.

Reintegrate

index 8052dda9af584a1035b3b015ce91981110a05012..0266e712f414311009b031b18f13ab3315e55fbd 100755 (executable)
@@ -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