chiark / gitweb /
Merge commit 'refs/top-bases/debian/locations' into debian/locations
[topgit.git] / tg-import.sh
index cbab738..799efc9 100644 (file)
@@ -24,6 +24,15 @@ while [ -n "$1" ]; do
 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"
@@ -50,12 +59,13 @@ process_commit()
 {
        commit="$1"
        branch_name=$(get_branch_name "$commit")
-       echo "Importing $commit to $branch_name"
+       info "---- Importing $commit to $branch_prefix$branch_name"
        tg create "$branch_prefix""$branch_name"
-       git read-tree "$commit"
+       git cherry-pick --no-commit "$commit"
        get_commit_msg "$commit" > .topmsg
        git add -f .topmsg .topdeps
        git commit -C "$commit"
+       info "++++ Importing $commit finished"
 }
 
 # nice arg verification stolen from git-format-patch.sh