chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Force adding the .topmsg and .topdep files.
[topgit.git]
/
tg-export.sh
diff --git
a/tg-export.sh
b/tg-export.sh
index 4ce54cd1e96a903a72781eb90af0e63c9ff831cf..62ea4f97f732b0d0f27e7b98ed742a7c8f5503ba 100644
(file)
--- a/
tg-export.sh
+++ b/
tg-export.sh
@@
-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
@@
-122,11
+122,10
@@
collapse()
else
# First time hitting this dep; the common case
else
# First time hitting this dep; the common case
+ echo "Collapsing $_dep"
commit="$(collapsed_commit "$_dep")"
commit="$(collapsed_commit "$_dep")"
-
mkdir -p "$playground/$(dirname "$_dep")"
echo "$commit" >"$playground/$_dep"
mkdir -p "$playground/$(dirname "$_dep")"
echo "$commit" >"$playground/$_dep"
- echo "Collapsed $_dep"
fi
# Propagate our work through the dependency chain
fi
# Propagate our work through the dependency chain
@@
-150,10
+149,10
@@
quilt()
return
fi
return
fi
+ echo "Exporting $_dep"
mkdir -p "$(dirname "$filename")"
tg patch "$_dep" >"$filename"
echo "$_dep.diff -p1" >>"$output/series"
mkdir -p "$(dirname "$filename")"
tg patch "$_dep" >"$filename"
echo "$_dep.diff -p1" >>"$output/series"
- echo "Exported $_dep"
}
}
@@
-191,7
+190,7
@@
recurse_deps driver "$name"
if [ "$driver" = "collapse" ]; then
if [ "$driver" = "collapse" ]; then
- git update-ref "refs/heads/$output" "$(cat "$playground/$name")"
+ git update-ref "refs/heads/$output" "$(cat "$playground/$name")"
""
depcount="$(cat "$playground/^ticker" | wc -l)"
echo "Exported topic branch $name (total $depcount topics) to branch $output"
depcount="$(cat "$playground/^ticker" | wc -l)"
echo "Exported topic branch $name (total $depcount topics) to branch $output"