chiark / gitweb /
tg update: Always checkout head, even if we didn't update base further
authorPetr Baudis <pasky@suse.cz>
Thu, 2 Oct 2008 11:09:14 +0000 (13:09 +0200)
committerPetr Baudis <pasky@suse.cz>
Thu, 2 Oct 2008 11:09:14 +0000 (13:09 +0200)
tg-update.sh

index 24615a6..040800d 100644 (file)
@@ -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"