X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-update.sh;h=040800d6fb3805ef92519e436fe9cbb353cdbb77;hp=24615a641cb7d3fe18b687dafd7e0b34e105a021;hb=9f5917da92ab8c32ab765a331ebcaf227b3e2f85;hpb=eafd8ec0bc6e50f452966ff3be0dde5ea863b640

diff --git a/tg-update.sh b/tg-update.sh
index 24615a6..040800d 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -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"