X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-import.sh;h=a8d3be5b3098d73c9b1dabfc9e1d509ae533a533;hp=9f03c3f6a5f46d0605ce3a5e40c3bbd4155fc1f9;hb=170fa45b8745b673d31f4b2398780fc0bb7c703d;hpb=3051faceb5eb73f328a76d790a23fa7a9c71b427

diff --git a/tg-import.sh b/tg-import.sh
index 9f03c3f..a8d3be5 100644
--- a/tg-import.sh
+++ b/tg-import.sh
@@ -42,7 +42,11 @@ git update-index --ignore-submodules --refresh || exit
 get_commit_msg()
 {
 	commit="$1"
-	git log -1 --pretty=format:"From: %an <%ae>%n%n%s%n%n%b" "$commit"
+	headers=""
+	! header="$(git config topgit.to)" || headers="$headers%nTo: $header"
+	! header="$(git config topgit.cc)" || headers="$headers%nCc: $header"
+	! header="$(git config topgit.bcc)" || headers="$headers%nBcc: $header"
+	git log -1 --pretty=format:"From: %an <%ae>$headers%nSubject: %s%n%n%b" "$commit"
 }
 
 get_branch_name()
@@ -68,15 +72,18 @@ 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"
 }
 
 if [ -n "$single" ]; then
-	process_commit "$ranges" "$single"
+	process_commit $ranges "$single"
 	exit
 fi
 
@@ -109,3 +116,5 @@ do
 		esac
 	done
 done
+
+# vim:noet