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

diff --git a/tg-update.sh b/tg-update.sh
index 24615a641cb7d3fe18b687dafd7e0b34e105a021..040800d6fb3805ef92519e436fe9cbb353cdbb77 100644 (file)
--- 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"