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 68477f0de31cf05fd66c7f48fcfee95fa7e31bce..799efc9a8395228604e1ccf94cc66a0c36144ec9 100644 (file)
--- a/tg-import.sh
+++ b/tg-import.sh
@@ -61,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 -u -m "$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"