debian/changelog: document new upstream release

[topgit.git] / tg-import.sh

diff --git a/tg-import.sh b/tg-import.sh
index 2a24fbb96dfc7e0600416e0eb51bae5bb63a95be..a8d3be5b3098d73c9b1dabfc9e1d509ae533a533 100644 (file)
--- 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,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"
 }
@@ -109,3 +116,5 @@ do
                esac
        done
 done
+
+# vim:noet