chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tg import: Make the progress reporting stand out more
[topgit.git]
/
tg-export.sh
diff --git
a/tg-export.sh
b/tg-export.sh
index 62361dd9b5abe721d2e5e1359df238798dcbcc54..654b38bf50805c182f67f189ce4cf5cfecda3fc0 100644
(file)
--- a/
tg-export.sh
+++ b/
tg-export.sh
@@
-18,7
+18,7
@@
while [ -n "$1" ]; do
--collapse)
driver=collapse;;
-*)
--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)"
exit 1;;
*)
[ -z "$output" ] || die "output already specified ($output)"
@@
-32,7
+32,7
@@
base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)"
die "not on a TopGit-controlled branch"
die "not on a TopGit-controlled branch"
-playground="$(mktemp -d)"
+playground="$(mktemp -d
-t tg-export.XXXXXX
)"
trap 'rm -rf "$playground"' EXIT
trap 'rm -rf "$playground"' EXIT
@@
-151,7
+151,7
@@
quilt()
echo "Exporting $_dep"
mkdir -p "$(dirname "$filename")"
echo "Exporting $_dep"
mkdir -p "$(dirname "$filename")"
- tg patch "$_dep" >"$filename"
+
$
tg patch "$_dep" >"$filename"
echo "$_dep.diff -p1" >>"$output/series"
}
echo "$_dep.diff -p1" >>"$output/series"
}
@@
-161,7
+161,7
@@
quilt()
if [ "$driver" = "collapse" ]; then
[ -n "$output" ] ||
die "no target branch specified"
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
die "target branch '$output' already exists; first run: git branch -D $output"
elif [ "$driver" = "quilt" ]; then