From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 01:52:20 +0000 (+0000)
Subject: Merge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=edcc314649885464279e62ac3eda08f44bd82f2c

Merge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps
---

edcc314649885464279e62ac3eda08f44bd82f2c
diff --cc tg-export.sh
index 5f7330b,486ec94..d68a6ac
--- a/tg-export.sh
+++ b/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