3 # Copyright (c) 2005 Junio C Hamano
6 . git-sh-setup || die "Not a git archive."
9 echo >&2 "usage: $0"' [-n] [-o dir] [--keep-subject] [--mbox] [--check] [--signoff] [-<diff options>...] upstream [ our-head ]
11 Prepare each commit with its patch since our-head forked from upstream,
12 one file per patch, for e-mail submission. Each output file is
13 numbered sequentially from 1, and uses the first line of the commit
14 message (massaged for pathname safety) as the filename.
16 When -o is specified, output files are created in that directory; otherwise in
17 the current working directory.
19 When -n is specified, instead of "[PATCH] Subject", the first line is formatted
20 as "[PATCH N/M] Subject", unless you have only one patch.
22 When --mbox is specified, the output is formatted to resemble
23 UNIX mailbox format, and can be concatenated together for processing
34 while case "$#" in 0) break;; esac
37 -a|--a|--au|--aut|--auth|--autho|--author)
39 -c|--c|--ch|--che|--chec|--check)
41 -d|--d|--da|--dat|--date)
43 -m|--m|--mb|--mbo|--mbox)
44 date=t author=t mbox=t ;;
45 -k|--k|--ke|--kee|--keep|--keep-|--keep-s|--keep-su|--keep-sub|\
46 --keep-subj|--keep-subje|--keep-subjec|--keep-subject)
48 -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered)
50 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
52 -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\
53 --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\
54 --output-direc=*|--output-direct=*|--output-directo=*|\
55 --output-director=*|--output-directory=*)
56 outdir=`expr "$1" : '-[^=]*=\(.*\)'` ;;
57 -o|--o|--ou|--out|--outp|--outpu|--output|--output-|--output-d|\
58 --output-di|--output-dir|--output-dire|--output-direc|--output-direct|\
59 --output-directo|--output-director|--output-directory)
60 case "$#" in 1) usage ;; esac; shift
62 -*' '* | -*"$LF"* | -*' '*)
63 # Ignore diff option that has whitespace for now.
65 -*) diff_opts="$diff_opts$1 " ;;
71 case "$keep_subject$numbered" in
73 die '--keep-subject and --numbered are incompatible.' ;;
79 rev1="$1" rev2="$2" ;;
83 rev1=`expr "$1" : '\(.*\)\.\.'`
84 rev2=`expr "$1" : '.*\.\.\(.*\)'`
95 me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
99 *) outdir="$outdir/" ;;
101 test -d "$outdir" || mkdir -p "$outdir" || exit
104 trap 'rm -f $tmp-*' 0 1 2 3 15
113 s/^\[PATCH[^]]*\] *//
114 s/[^-a-z.A-Z_0-9]/-/g
127 s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
131 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
132 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
133 stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d'
135 git-cherry -v "$rev1" "$rev2" |
136 while read sign rev comment
140 echo >&2 "Merged already: $comment"
148 total=`wc -l <$series | tr -dc "[0-9]"`
152 git-cat-file commit "$commit" | git-stripspace >$commsg
153 title=`sed -ne "$titleScript" <$commsg`
159 *) num=' '`printf "%d/%d" $i $total` ;;
163 file=`printf '%04d-%stxt' $i "$title"`
170 case "$keep_subject" in
173 mailScript="$mailScript"'
174 s|^\[PATCH[^]]*\] *||
175 s|^|[PATCH'"$num"'] |'
178 mailScript="$mailScript"'
182 echo 'From nobody Mon Sep 17 00:00:00 2001' ;# UNIX "From" line
185 eval "$(sed -ne "$whosepatchScript" $commsg)"
186 test "$author,$au" = ",$me" || {
187 mailScript="$mailScript"'
191 test "$date,$au" = ",$me" || {
192 mailScript="$mailScript"'
197 mailScript="$mailScript"'
203 sed -ne "$mailScript" <$commsg
205 test "$signoff" = "t" && {
206 offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`
207 line="Signed-off-by: $offsigner"
208 grep -q "^$line\$" $commsg || {
217 git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
219 git-diff-tree -p $diff_opts "$commit" | sed -e "$stripCommitHead"
229 # This is slightly modified from Andrew Morton's Perfect Patch.
230 # Lines you introduce should not have trailing whitespace.
231 # Also check for an indentation that has SP before a TAB.
232 grep -n '^+\([ ]* .*\|.*[ ]\)$' "$outdir$file"
234 : do not exit with non-zero because we saw no problem in the last one.