Allow adding arbitary lines in the mail header generated by format-patch.

Entries may be added to the config file as follows:

[format]
headers = "Organization: CodeWeavers\nTo: wine-patches
<wine-patches@winehq.org>\n"

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 2bd26395ecc687e01c7915b5ba13e9576749143b..bbd2e5532f73ec2018e261f4dbf81b027329bc87 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -149,6 +149,7 @@ do
 done >$series
 
 me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
 done >$series
 
 me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`

+headers=`git-repo-config --get format.headers`

 
 case "$outdir" in
 */) ;;
 
 case "$outdir" in
 */) ;;


@@ -173,7 +174,7 @@ titleScript='
 
 process_one () {
        perl -w -e '
 
 process_one () {
        perl -w -e '

-my ($keep_subject, $num, $signoff, $commsg) = @ARGV;
+my ($keep_subject, $num, $signoff, $headers, $commsg) = @ARGV;

 my ($signoff_pattern, $done_header, $done_subject, $done_separator, $signoff_seen,
     $last_was_signoff);
 
 my ($signoff_pattern, $done_header, $done_subject, $done_separator, $signoff_seen,
     $last_was_signoff);
 


@@ -224,6 +225,9 @@ while (<FH>) {
            s/^\[PATCH[^]]*\]\s*//;
            s/^/[PATCH$num] /;
        }
            s/^\[PATCH[^]]*\]\s*//;
            s/^/[PATCH$num] /;
        }

+       if ($headers) {
+           print "$headers\n";
+       }

         print "Subject: $_";
        $done_subject = 1;
        next;
         print "Subject: $_";
        $done_subject = 1;
        next;


@@ -250,7 +254,7 @@ if (!$signoff_seen && $signoff ne "") {
 }
 print "\n---\n\n";
 close FH or die "close $commsg pipe";
 }
 print "\n---\n\n";
 close FH or die "close $commsg pipe";

-' "$keep_subject" "$num" "$signoff" $commsg
+' "$keep_subject" "$num" "$signoff" "$headers" $commsg

 
        git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
        echo
 
        git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
        echo