refactor

[topgit.git] / tg-update.sh

diff --git a/tg-update.sh b/tg-update.sh
index 39769bead098c674ff8a8a12f7dfb48254191a7b..040800d6fb3805ef92519e436fe9cbb353cdbb77 100644 (file)
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -75,7 +75,7 @@ if [ -s "$depcheck" ]; then
                        info "Updating base with $dep changes..."
                        if ! git merge "$dep"; then
                                if [ -z "$TG_RECURSIVE" ]; then
-                                       resume='`$tg update` again'
+                                       resume="\`git checkout $name && $tg update\` again"
                                else # subshell
                                        resume='exit'
                                fi
@@ -87,14 +87,16 @@ if [ -s "$depcheck" ]; then
                                exit 2
                        fi
                done
-
-       # Home, sweet home...
-       git checkout -q "$name"
 else
        info "The base is up-to-date."
 fi
 rm "$depcheck"
 
+# Home, sweet home...
+# (We want to always switch back, in case we were on the base from failed
+# previous merge.)
+git checkout -q "$name"
+
 merge_with="refs/top-bases/$name"