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>...]
11 ( from..to ... | upstream [ our-head ] )
13 Prepare each commit with its patch since our-head forked from upstream,
14 one file per patch, for e-mail submission. Each output file is
15 numbered sequentially from 1, and uses the first line of the commit
16 message (massaged for pathname safety) as the filename.
18 When -o is specified, output files are created in that directory; otherwise in
19 the current working directory.
21 When -n is specified, instead of "[PATCH] Subject", the first line is formatted
22 as "[PATCH N/M] Subject", unless you have only one patch.
24 When --mbox is specified, the output is formatted to resemble
25 UNIX mailbox format, and can be concatenated together for processing
36 while case "$#" in 0) break;; esac
39 -a|--a|--au|--aut|--auth|--autho|--author)
41 -c|--c|--ch|--che|--chec|--check)
43 -d|--d|--da|--dat|--date)
45 -m|--m|--mb|--mbo|--mbox)
46 date=t author=t mbox=t ;;
47 -k|--k|--ke|--kee|--keep|--keep-|--keep-s|--keep-su|--keep-sub|\
48 --keep-subj|--keep-subje|--keep-subjec|--keep-subject)
50 -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered)
52 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
54 --st|--std|--stdo|--stdou|--stdout)
55 stdout=t mbox=t date=t author=t ;;
56 -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\
57 --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\
58 --output-direc=*|--output-direct=*|--output-directo=*|\
59 --output-director=*|--output-directory=*)
60 outdir=`expr "$1" : '-[^=]*=\(.*\)'` ;;
61 -o|--o|--ou|--out|--outp|--outpu|--output|--output-|--output-d|\
62 --output-di|--output-dir|--output-dire|--output-direc|--output-direct|\
63 --output-directo|--output-director|--output-directory)
64 case "$#" in 1) usage ;; esac; shift
66 -*' '* | -*"$LF"* | -*' '*)
67 # Ignore diff option that has whitespace for now.
69 -*) diff_opts="$diff_opts$1 " ;;
75 case "$keep_subject$numbered" in
77 die '--keep-subject and --numbered are incompatible.' ;;
81 trap 'rm -f $tmp-*' 0 1 2 3 15
87 # Backward compatible argument parsing hack.
89 # Historically, we supported:
90 # 1. "rev1" is equivalent to "rev1..HEAD"
92 # 3. "rev1" "rev2 is equivalent to "rev1..rev2"
94 # We want to take a sequence of "rev1..rev2" in general.
95 # Also, "rev1.." should mean "rev1..HEAD"; git-diff users are
96 # familiar with that syntax.
100 # single "rev1..rev2"
103 # single "rev1.." should mean "rev1..HEAD"
113 # not traditional "rev1" "rev2"
121 # Now we have what we want in $@
126 rev1=`expr "$revpair" : '\(.*\)\.\.'`
127 rev2=`expr "$revpair" : '.*\.\.\(.*\)'`
133 git-rev-parse --verify "$rev1^0" >/dev/null 2>&1 ||
134 die "Not a valid rev $rev1 ($revpair)"
135 git-rev-parse --verify "$rev2^0" >/dev/null 2>&1 ||
136 die "Not a valid rev $rev2 ($revpair)"
137 git-cherry -v "$rev1" "$rev2" |
138 while read sign rev comment
142 echo >&2 "Merged already: $comment"
151 me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
155 *) outdir="$outdir/" ;;
157 test -d "$outdir" || mkdir -p "$outdir" || exit
162 s/^\[PATCH[^]]*\] *//
163 s/[^-a-z.A-Z_0-9]/-/g
176 s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
184 case "$keep_subject" in
187 mailScript="$mailScript"'
188 s|^\[PATCH[^]]*\] *||
189 s|^|[PATCH'"$num"'] |'
192 mailScript="$mailScript"'
196 echo 'From nobody Mon Sep 17 00:00:00 2001' ;# UNIX "From" line
200 eval "$(sed -ne "$whosepatchScript" $commsg)"
201 test "$author,$au" = ",$me" || {
202 mailScript="$mailScript"'
206 test "$date,$au" = ",$me" || {
207 mailScript="$mailScript"'
212 mailScript="$mailScript"'
218 (cat $commsg ; echo; echo) |
219 sed -ne "$mailScript" |
222 test "$signoff" = "t" && {
223 offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`
224 line="Signed-off-by: $offsigner"
225 grep -q "^$line\$" $commsg || {
234 git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
236 git-cat-file commit "$commit^" | sed -e 's/^tree /applies-to: /' -e q
237 git-diff-tree -p $diff_opts "$commit"
239 echo "@@GIT_VERSION@@"
248 total=`wc -l <$series | tr -dc "[0-9]"`
252 git-cat-file commit "$commit" | git-stripspace >$commsg
253 title=`sed -ne "$titleScript" <$commsg`
259 *) num=' '`printf "%d/%d" $i $total` ;;
263 file=`printf '%04d-%stxt' $i "$title"`
264 if test '' = "$stdout"
267 process_one >"$outdir$file"
270 # This is slightly modified from Andrew Morton's Perfect Patch.
271 # Lines you introduce should not have trailing whitespace.
272 # Also check for an indentation that has SP before a TAB.
273 grep -n '^+\([ ]* .*\|.*[ ]\)$' "$outdir$file"