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

diff --git a/tg-create.sh b/tg-create.sh
index 8d39f46fe7c067438ff0249e2c4f7c865622ea8b..30c69c9ee1929ba80af155e46e704c4e339f7d73 100644 (file)
--- 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