From: Petr Baudis <pasky@suse.cz>
Date: Thu, 2 Oct 2008 11:09:14 +0000 (+0200)
Subject: tg update: Always checkout head, even if we didn't update base further
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ca372f7719a52dfa46af01362df6c4538c004727;p=topgit.git

tg update: Always checkout head, even if we didn't update base further
---

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"