ignore new git-diff index header when computing patch ids
[git.git] / git-format-patch.sh
blob2844799535a4c63f61f6c94cf7a66c88d0052656
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
6 . git-sh-setup || die "Not a git archive."
8 usage () {
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
24 with applymbox.
26 exit 1
29 diff_opts=
30 LF='
33 outdir=./
34 while case "$#" in 0) break;; esac
36 case "$1" in
37 -a|--a|--au|--aut|--auth|--autho|--author)
38 author=t ;;
39 -c|--c|--ch|--che|--chec|--check)
40 check=t ;;
41 -d|--d|--da|--dat|--date)
42 date=t ;;
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)
47 keep_subject=t ;;
48 -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered)
49 numbered=t ;;
50 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
51 signoff=t ;;
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
61 outdir="$1" ;;
62 -*' '* | -*"$LF"* | -*' '*)
63 # Ignore diff option that has whitespace for now.
65 -*) diff_opts="$diff_opts$1 " ;;
66 *) break ;;
67 esac
68 shift
69 done
71 case "$keep_subject$numbered" in
72 tt)
73 die '--keep-subject and --numbered are incompatible.' ;;
74 esac
76 rev1= rev2=
77 case "$#" in
79 rev1="$1" rev2="$2" ;;
81 case "$1" in
82 *..*)
83 rev1=`expr "$1" : '\(.*\)\.\.'`
84 rev2=`expr "$1" : '.*\.\.\(.*\)'`
87 rev1="$1"
88 rev2="HEAD"
90 esac ;;
92 usage ;;
93 esac
95 me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
97 case "$outdir" in
98 */) ;;
99 *) outdir="$outdir/" ;;
100 esac
101 test -d "$outdir" || mkdir -p "$outdir" || exit
103 tmp=.tmp-series$$
104 trap 'rm -f $tmp-*' 0 1 2 3 15
106 series=$tmp-series
107 commsg=$tmp-commsg
108 filelist=$tmp-files
110 titleScript='
111 /./d
112 /^$/n
113 s/^\[PATCH[^]]*\] *//
114 s/[^-a-z.A-Z_0-9]/-/g
115 s/\.\.\.*/\./g
116 s/\.*$//
117 s/--*/-/g
118 s/^-//
119 s/-$//
120 s/$/./
125 whosepatchScript='
126 /^author /{
127 s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
131 git-cherry -v "$rev1" "$rev2" |
132 while read sign rev comment
134 case "$sign" in
135 '-')
136 echo >&2 "Merged already: $comment"
139 echo $rev
141 esac
142 done >$series
144 total=`wc -l <$series | tr -dc "[0-9]"`
146 while read commit
148 git-cat-file commit "$commit" | git-stripspace >$commsg
149 title=`sed -ne "$titleScript" <$commsg`
150 case "$numbered" in
151 '') num= ;;
153 case $total in
154 1) num= ;;
155 *) num=' '`printf "%d/%d" $i $total` ;;
156 esac
157 esac
159 file=`printf '%04d-%stxt' $i "$title"`
160 i=`expr "$i" + 1`
161 echo "* $file"
163 mailScript='
164 /./d
165 /^$/n'
166 case "$keep_subject" in
167 t) ;;
169 mailScript="$mailScript"'
170 s|^\[PATCH[^]]*\] *||
171 s|^|[PATCH'"$num"'] |'
173 esac
174 mailScript="$mailScript"'
175 s|^|Subject: |'
176 case "$mbox" in
178 echo 'From nobody Mon Sep 17 00:00:00 2001' ;# UNIX "From" line
180 esac
181 eval "$(sed -ne "$whosepatchScript" $commsg)"
182 test "$author,$au" = ",$me" || {
183 mailScript="$mailScript"'
185 From: '"$au"
187 test "$date,$au" = ",$me" || {
188 mailScript="$mailScript"'
190 Date: '"$ad"
193 mailScript="$mailScript"'
194 : body
197 b body'
199 sed -ne "$mailScript" <$commsg
201 test "$signoff" = "t" && {
202 offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`
203 line="Signed-off-by: $offsigner"
204 grep -q "^$line\$" $commsg || {
205 echo
206 echo "$line"
207 echo
210 echo
211 echo '---'
212 echo
213 git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
214 echo
215 git-diff-tree -p $diff_opts "$commit"
217 case "$mbox" in
219 echo
221 esac
222 } >"$outdir$file"
223 case "$check" in
225 # This is slightly modified from Andrew Morton's Perfect Patch.
226 # Lines you introduce should not have trailing whitespace.
227 # Also check for an indentation that has SP before a TAB.
228 grep -n '^+\([ ]* .*\|.*[ ]\)$' "$outdir$file"
230 : do not exit with non-zero because we saw no problem in the last one.
231 esac
232 done <$series