chiark / gitweb /
tg update: Fix bogus advice on failed base update
authorPetr Baudis <pasky@suse.cz>
Thu, 25 Sep 2008 18:50:36 +0000 (20:50 +0200)
committerPetr Baudis <pasky@suse.cz>
Thu, 25 Sep 2008 18:50:36 +0000 (20:50 +0200)
tg-update.sh

index f36624f..24615a6 100644 (file)
@@ -75,7 +75,7 @@ if [ -s "$depcheck" ]; then
                        info "Updating base with $dep changes..."
                        if ! git merge "$dep"; then
                                if [ -z "$TG_RECURSIVE" ]; then
-                                       resume="\`$tg update\` again"
+                                       resume="\`git checkout $name && $tg update\` again"
                                else # subshell
                                        resume='exit'
                                fi