Merge commit 'refs/top-bases/debian/locations' into debian/locations

[topgit.git] / tg-import.sh

diff --git a/tg-import.sh b/tg-import.sh
index cdc0969efdc8bcab2a07b4def8c878a42287b8fc..799efc9a8395228604e1ccf94cc66a0c36144ec9 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"


@@ -50,12 +59,13 @@ process_commit()
 {
        commit="$1"
        branch_name=$(get_branch_name "$commit")
 {
        commit="$1"
        branch_name=$(get_branch_name "$commit")

-       info "Importing $commit to $branch_prefix$branch_name"
+       info "---- Importing $commit to $branch_prefix$branch_name"

        tg create "$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"
        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
 }
 
 # nice arg verification stolen from git-format-patch.sh