From: Petr Baudis <pasky@suse.cz>
Date: Thu, 25 Sep 2008 18:50:36 +0000 (+0200)
Subject: tg update: Fix bogus advice on failed base update
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=eafd8ec0bc6e50f452966ff3be0dde5ea863b640;p=topgit.git

tg update: Fix bogus advice on failed base update
---

diff --git a/tg-update.sh b/tg-update.sh
index f36624f..24615a6 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -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