chiark / gitweb /
tg import: More graceful conflicts handling
authorPetr Baudis <pasky@suse.cz>
Thu, 25 Sep 2008 18:50:25 +0000 (20:50 +0200)
committerPetr Baudis <pasky@suse.cz>
Thu, 25 Sep 2008 18:50:25 +0000 (20:50 +0200)
tg-import.sh

index 424f518..b036b86 100644 (file)
@@ -72,9 +72,12 @@ process_commit()
        info "---- Importing $commit to $branch_name"
        tg create "$branch_name" $basedep
        basedep=
-       git cherry-pick --no-commit "$commit"
        get_commit_msg "$commit" > .topmsg
        git add -f .topmsg .topdeps
+       if ! git cherry-pick --no-commit "$commit"; then
+               info "The commit will also finish the import of this patch."
+               exit 2
+       fi
        git commit -C "$commit"
        info "++++ Importing $commit finished"
 }