From: Petr Baudis <pasky@suse.cz>
Date: Sun, 3 Aug 2008 01:56:34 +0000 (+0200)
Subject: tg-create.sh: Fix several bugs when resuming after conflicts
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=e621316dcb163c6ea04929b6b1e9e5b93d5d73d5

tg-create.sh: Fix several bugs when resuming after conflicts
---

diff --git a/tg-create.sh b/tg-create.sh
index 8d39f46..30c69c9 100644
--- a/tg-create.sh
+++ b/tg-create.sh
@@ -30,12 +30,12 @@ done
 
 if [ -z "$deps" ]; then
 	head="$(git symbolic-ref HEAD)"
-	bname="${heads#refs/top-bases/}"
+	bname="${head#refs/top-bases/}"
 	if [ "$bname" != "$head" -a -s "$git_dir/top-deps" -a -s "$git_dir/top-merge" ]; then
 		# We are on a base branch now; resume merge!
 		deps="$(cat "$git_dir/top-deps")"
-		merge="$(cat "$git_dir/top-merge") "
-		name="$base"
+		merge="$(cat "$git_dir/top-merge")"
+		name="$bname"
 		restarted=1
 		info "Resuming $name setup..."
 	else