X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-update.sh;h=288ec14f849495734fec17b839abf678f366ad78;hb=f6bd1cd919899d8de2be58b60dce17e17b44f0f9;hp=24615a641cb7d3fe18b687dafd7e0b34e105a021;hpb=eafd8ec0bc6e50f452966ff3be0dde5ea863b640;p=topgit.git

diff --git a/tg-update.sh b/tg-update.sh
index 24615a6..288ec14 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"
 
 
@@ -140,3 +142,5 @@ if ! git merge "$merge_with"; then
 	fi
 	exit 3
 fi
+
+# vim:noet