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>
This commit is contained in:
parent
1242642c46
commit
00333ca35c
@ -149,6 +149,7 @@ do
|
|||||||
done >$series
|
done >$series
|
||||||
|
|
||||||
me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
|
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 () {
|
process_one () {
|
||||||
perl -w -e '
|
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,
|
my ($signoff_pattern, $done_header, $done_subject, $done_separator, $signoff_seen,
|
||||||
$last_was_signoff);
|
$last_was_signoff);
|
||||||
|
|
||||||
@ -224,6 +225,9 @@ while (<FH>) {
|
|||||||
s/^\[PATCH[^]]*\]\s*//;
|
s/^\[PATCH[^]]*\]\s*//;
|
||||||
s/^/[PATCH$num] /;
|
s/^/[PATCH$num] /;
|
||||||
}
|
}
|
||||||
|
if ($headers) {
|
||||||
|
print "$headers\n";
|
||||||
|
}
|
||||||
print "Subject: $_";
|
print "Subject: $_";
|
||||||
$done_subject = 1;
|
$done_subject = 1;
|
||||||
next;
|
next;
|
||||||
@ -250,7 +254,7 @@ if (!$signoff_seen && $signoff ne "") {
|
|||||||
}
|
}
|
||||||
print "\n---\n\n";
|
print "\n---\n\n";
|
||||||
close FH or die "close $commsg pipe";
|
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
|
git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
|
||||||
echo
|
echo
|
||||||
|
Loading…
Reference in New Issue
Block a user