chiark / gitweb /
Merge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps fixes/export--b-deps
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:52:20 +0000 (01:52 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:52:20 +0000 (01:52 +0000)
1  2 
tg-export.sh

diff --cc tg-export.sh
@@@ -54,17 -54,10 +54,16 @@@ if [ -z "$branches" ]; the
        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"
 +      branches="$name"
 +else
 +      name="${branches##*,}" # the last of the comma-separated items
  fi
 +# $name holds the current branch
 +# $branches holds the comma-separated list of branches
 +# $name is equal to the last of the list of branches
  
  
- playground="$(mktemp -d -t tg-export.XXXXXX)"
- trap 'rm -rf "$playground"' EXIT
+ playground="$(get_temp tg-export -d)"
  
  
  ## Collapse driver