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 info, tg patch: Work on top-base HEAD too
[topgit.git]
/
tg-import.sh
diff --git
a/tg-import.sh
b/tg-import.sh
index 6a4f79ea27e0116814c271b03046a3f2eb874da4..68477f0de31cf05fd66c7f48fcfee95fa7e31bce 100644
(file)
--- a/
tg-import.sh
+++ b/
tg-import.sh
@@
-24,6
+24,15
@@
while [ -n "$1" ]; do
done
done
+## Make sure our tree is clean
+
+git update-index --ignore-submodules --refresh || exit
+[ -z "$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)" ] ||
+ die "the index is not clean"
+
+
+## Perform import
+
get_commit_msg()
{
commit="$1"
get_commit_msg()
{
commit="$1"
@@
-52,7
+61,7
@@
process_commit()
branch_name=$(get_branch_name "$commit")
info "---- Importing $commit to $branch_prefix$branch_name"
tg create "$branch_prefix""$branch_name"
branch_name=$(get_branch_name "$commit")
info "---- Importing $commit to $branch_prefix$branch_name"
tg create "$branch_prefix""$branch_name"
- git read-tree "$commit"
+ git read-tree
-u -m
"$commit"
get_commit_msg "$commit" > .topmsg
git add -f .topmsg .topdeps
git commit -C "$commit"
get_commit_msg "$commit" > .topmsg
git add -f .topmsg .topdeps
git commit -C "$commit"