3 # Copyright (c) 2005 Junio C Hamano
6 . git-sh-setup || die
"Not a git archive."
9 echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
10 [--check] [--signoff] [-<diff options>...]
12 ( from..to ... | upstream [ our-head ] )
14 Prepare each commit with its patch since our-head forked from upstream,
15 one file per patch, for e-mail submission. Each output file is
16 numbered sequentially from 1, and uses the first line of the commit
17 message (massaged for pathname safety) as the filename.
19 When -o is specified, output files are created in that directory; otherwise in
20 the current working directory.
22 When -n is specified, instead of "[PATCH] Subject", the first line is formatted
23 as "[PATCH N/M] Subject", unless you have only one patch.
25 When --mbox is specified, the output is formatted to resemble
26 UNIX mailbox format, and can be concatenated together for processing
37 while case "$#" in 0) break;; esac
40 -a|
--a|
--au|
--aut|
--auth|
--autho|
--author)
42 -c|
--c|
--ch|
--che|
--chec|
--check)
44 -d|
--d|
--da|
--dat|
--date)
46 -m|
--m|
--mb|
--mbo|
--mbox)
47 date=t author
=t mbox
=t
;;
48 -k|
--k|
--ke|
--kee|
--keep|
--keep-|
--keep-s|
--keep-su|
--keep-sub|\
49 --keep-subj|
--keep-subje|
--keep-subjec|
--keep-subject)
51 -n|
--n|
--nu|
--num|
--numb|
--numbe|
--number|
--numbere|
--numbered)
53 -s|
--s|
--si|
--sig|
--sign|
--signo|
--signof|
--signoff)
55 --st|
--std|
--stdo|
--stdou|
--stdout)
56 stdout
=t mbox
=t
date=t author
=t
;;
57 -o=*|
--o=*|
--ou=*|
--out=*|
--outp=*|
--outpu=*|
--output=*|
--output-=*|\
58 --output-d=*|
--output-di=*|
--output-dir=*|
--output-dire=*|\
59 --output-direc=*|
--output-direct=*|
--output-directo=*|\
60 --output-director=*|
--output-directory=*)
61 outdir
=`expr "$1" : '-[^=]*=\(.*\)'` ;;
62 -o|
--o|
--ou|
--out|
--outp|
--outpu|
--output|
--output-|
--output-d|\
63 --output-di|
--output-dir|
--output-dire|
--output-direc|
--output-direct|\
64 --output-directo|
--output-director|
--output-directory)
65 case "$#" in 1) usage
;; esac; shift
67 -h|
--h|
--he|
--hel|
--help)
70 -*' '* |
-*"$LF"* |
-*' '*)
71 # Ignore diff option that has whitespace for now.
73 -*) diff_opts
="$diff_opts$1 " ;;
79 case "$keep_subject$numbered" in
81 die
'--keep-subject and --numbered are incompatible.' ;;
85 trap 'rm -f $tmp-*' 0 1 2 3 15
91 # Backward compatible argument parsing hack.
93 # Historically, we supported:
94 # 1. "rev1" is equivalent to "rev1..HEAD"
96 # 3. "rev1" "rev2 is equivalent to "rev1..rev2"
98 # We want to take a sequence of "rev1..rev2" in general.
99 # Also, "rev1.." should mean "rev1..HEAD"; git-diff users are
100 # familiar with that syntax.
104 # single "rev1..rev2"
107 # single "rev1.." should mean "rev1..HEAD"
117 # not traditional "rev1" "rev2"
125 # Now we have what we want in $@
130 rev1
=`expr "$revpair" : '\(.*\)\.\.'`
131 rev2
=`expr "$revpair" : '.*\.\.\(.*\)'`
138 git-rev-parse
--verify "$rev1^0" >/dev
/null
2>&1 ||
139 die
"Not a valid rev $rev1 ($revpair)"
140 git-rev-parse
--verify "$rev2^0" >/dev
/null
2>&1 ||
141 die
"Not a valid rev $rev2 ($revpair)"
142 git-cherry
-v "$rev1" "$rev2" |
143 while read sign
rev comment
147 echo >&2 "Merged already: $comment"
156 me
=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
160 *) outdir
="$outdir/" ;;
162 test -d "$outdir" || mkdir
-p "$outdir" ||
exit
167 s/^\[PATCH[^]]*\] *//
168 s/[^-a-z.A-Z_0-9]/-/g
181 s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
189 case "$keep_subject" in
192 mailScript
="$mailScript"'
193 s|^\[PATCH[^]]*\] *||
194 s|^|[PATCH'"$num"'] |'
197 mailScript
="$mailScript"'
201 echo 'From nobody Mon Sep 17 00:00:00 2001' ;# UNIX "From" line
205 eval "$(LANG=C LC_ALL=C sed -ne "$whosepatchScript" $commsg)"
206 test "$author,$au" = ",$me" ||
{
207 mailScript
="$mailScript"'
211 test "$date,$au" = ",$me" ||
{
212 mailScript
="$mailScript"'
217 mailScript
="$mailScript"'
223 (cat $commsg ; echo; echo) |
224 sed -ne "$mailScript" |
227 test "$signoff" = "t" && {
228 offsigner
=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`
229 line
="Signed-off-by: $offsigner"
230 grep -q "^$line\$" $commsg ||
{
239 git-diff-tree
-p $diff_opts "$commit" | git-apply
--stat --summary
241 git-cat-file commit
"$commit^" |
sed -e 's/^tree /applies-to: /' -e q
242 git-diff-tree
-p $diff_opts "$commit"
244 echo "@@GIT_VERSION@@"
253 total
=`wc -l <$series | tr -dc "[0-9]"`
257 git-cat-file commit
"$commit" | git-stripspace
>$commsg
258 title
=`sed -ne "$titleScript" <$commsg`
264 *) num
=' '`printf "%d/%d" $i $total` ;;
268 file=`printf '%04d-%stxt' $i "$title"`
269 if test '' = "$stdout"
272 process_one
>"$outdir$file"
275 # This is slightly modified from Andrew Morton's Perfect Patch.
276 # Lines you introduce should not have trailing whitespace.
277 # Also check for an indentation that has SP before a TAB.
278 grep -n '^+\([ ]* .*\|.*[ ]\)$' "$outdir$file"