reflect TopGit remote handling and slight changes to the process

[topgit.git] / tg-export.sh

diff --git a/tg-export.sh b/tg-export.sh
index 62ea4f97f732b0d0f27e7b98ed742a7c8f5503ba..654b38bf50805c182f67f189ce4cf5cfecda3fc0 100644 (file)
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -18,7 +18,7 @@ while [ -n "$1" ]; do
        --collapse)
                driver=collapse;;
        -*)
-               echo "Usage: tg export ([--collapse] NEWBRANCH | --quilt DIRECTORY)" >&2
+               echo "Usage: tg [...] export ([--collapse] NEWBRANCH | --quilt DIRECTORY)" >&2
                exit 1;;
        *)
                [ -z "$output" ] || die "output already specified ($output)"
@@ -151,7 +151,7 @@ quilt()
 
        echo "Exporting $_dep"
        mkdir -p "$(dirname "$filename")"
-       tg patch "$_dep" >"$filename"
+       $tg patch "$_dep" >"$filename"
        echo "$_dep.diff -p1" >>"$output/series"
 }
 
@@ -161,7 +161,7 @@ quilt()
 if [ "$driver" = "collapse" ]; then
        [ -n "$output" ] ||
                die "no target branch specified"
-       ! git rev-parse --verify "$output" >/dev/null 2>&1 ||
+       ! ref_exists "$output"  ||
                die "target branch '$output' already exists; first run: git branch -D $output"
 
 elif [ "$driver" = "quilt" ]; then