chiark / gitweb /
tg-export: no current branch check with -b
authormartin f. krafft <madduck@madduck.net>
Fri, 26 Sep 2008 19:17:12 +0000 (21:17 +0200)
committerPetr Baudis <pasky@suse.cz>
Fri, 7 Nov 2008 21:24:03 +0000 (22:24 +0100)
When --quilt .. -b is given, TopGit dies with

  piper:../pkg/topgit/topgit|build|% tg export --quilt -b debian/locations debian/patches
  tg: fatal: not on a TopGit-controlled branch

which is a little too restrictive as we don't have to be on a tg branch with
-b. This patch simply removes this check if -b has been passed.

Signed-off-by: martin f. krafft <madduck@madduck.net>
tg-export.sh

index 659e15a..52af88d 100644 (file)
@@ -30,13 +30,17 @@ while [ -n "$1" ]; do
 done
 
 
-name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
-base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
-       die "not on a TopGit-controlled branch"
 
 [ -z "$branches" -o "$driver" = "quilt" ] ||
        die "-b works only with the quilt driver"
 
+if [ -z "$branches" ]; then
+       # this check is only needed when no branches have been passed
+       name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
+       base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
+               die "not on a TopGit-controlled branch"
+fi
+
 
 playground="$(mktemp -d -t tg-export.XXXXXX)"
 trap 'rm -rf "$playground"' EXIT