X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-import.sh;h=b036b8645f184f54ca14878cdc02312f4f925eaf;hb=538f91a77a5c629e1d25244a3a84d03aedbb9709;hp=424f51847ac750ee518e5d66b620cb900033a095;hpb=67ae5b2708ea78bf3d9eaa21cb4f0096cfeb4012;p=topgit.git

diff --git a/tg-import.sh b/tg-import.sh
index 424f518..b036b86 100644
--- a/tg-import.sh
+++ b/tg-import.sh
@@ -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"
 }