blob: 9fdf234b522322cf4e5d539f52debe76bebf6aa8 [file] [log] [blame]
Linus Torvaldsa3e870f2005-05-30 12:51:00 -07001#!/bin/sh
Junio C Hamano5fec3ef2005-06-25 02:22:05 -07002#
3# Copyright (c) 2005 Linus Torvalds
Junio C Hamano130fcca2006-02-05 00:07:44 -08004# Copyright (c) 2006 Junio C Hamano
Junio C Hamano5fec3ef2005-06-25 02:22:05 -07005
Matthias Lederhofer443f8332006-05-22 23:02:06 +02006USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-u] [--amend] [-e] [--author <author>] [[-i | -o] <path>...]'
Junio C Hamano130fcca2006-02-05 00:07:44 -08007SUBDIRECTORY_OK=Yes
Junio C Hamanoae2b0f12005-11-24 00:12:11 -08008. git-sh-setup
Shawn O. Pearce7eff28a2006-12-30 23:32:38 -05009require_work_tree
Linus Torvaldsb33e9662005-07-08 10:57:21 -070010
Junio C Hamanocf7bb582006-02-10 00:45:59 -080011git-rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t
Junio C Hamanocf7bb582006-02-10 00:45:59 -080012
13case "$0" in
14*status)
15 status_only=t
16 unmerged_ok_if_status=--unmerged ;;
17*commit)
18 status_only=
19 unmerged_ok_if_status= ;;
20esac
Junio C Hamano130fcca2006-02-05 00:07:44 -080021
22refuse_partial () {
23 echo >&2 "$1"
Junio C Hamano130fcca2006-02-05 00:07:44 -080024 echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?"
25 exit 1
26}
27
Junio C Hamanocf7bb582006-02-10 00:45:59 -080028THIS_INDEX="$GIT_DIR/index"
29NEXT_INDEX="$GIT_DIR/next-index$$"
30rm -f "$NEXT_INDEX"
Junio C Hamano5a798fb2006-02-05 16:08:01 -080031save_index () {
Junio C Hamanocc7d5bc2006-06-29 14:48:22 -070032 cp -p "$THIS_INDEX" "$NEXT_INDEX"
Junio C Hamanocf7bb582006-02-10 00:45:59 -080033}
34
Junio C Hamano5a798fb2006-02-05 16:08:01 -080035run_status () {
Junio C Hamanocf7bb582006-02-10 00:45:59 -080036 # If TMP_INDEX is defined, that means we are doing
37 # "--only" partial commit, and that index file is used
38 # to build the tree for the commit. Otherwise, if
39 # NEXT_INDEX exists, that is the index file used to
40 # make the commit. Otherwise we are using as-is commit
41 # so the regular index file is what we use to compare.
42 if test '' != "$TMP_INDEX"
43 then
Martin Waitz3de63c32006-10-07 21:07:40 +020044 GIT_INDEX_FILE="$TMP_INDEX"
45 export GIT_INDEX_FILE
Junio C Hamanocf7bb582006-02-10 00:45:59 -080046 elif test -f "$NEXT_INDEX"
47 then
Martin Waitz3de63c32006-10-07 21:07:40 +020048 GIT_INDEX_FILE="$NEXT_INDEX"
49 export GIT_INDEX_FILE
Junio C Hamanocf7bb582006-02-10 00:45:59 -080050 fi
51
Martin Waitz3de63c32006-10-07 21:07:40 +020052 case "$status_only" in
53 t) color= ;;
54 *) color=--nocolor ;;
55 esac
56 git-runstatus ${color} \
57 ${verbose:+--verbose} \
58 ${amend:+--amend} \
Johannes Schindelin2074cb02006-09-12 22:45:12 +020059 ${untracked_files:+--untracked}
Junio C Hamano5a798fb2006-02-05 16:08:01 -080060}
61
Junio C Hamanocf7bb582006-02-10 00:45:59 -080062trap '
63 test -z "$TMP_INDEX" || {
64 test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
65 }
66 rm -f "$NEXT_INDEX"
67' 0
68
69################################################################
70# Command line argument parsing and sanity checking
71
Junio C Hamano130fcca2006-02-05 00:07:44 -080072all=
73also=
Junio C Hamano5a798fb2006-02-05 16:08:01 -080074only=
Junio C Hamano130fcca2006-02-05 00:07:44 -080075logfile=
76use_commit=
Junio C Hamanob4019f02006-03-02 21:04:05 -080077amend=
Jeff Kingcda8ab52006-06-23 09:43:38 -040078edit_flag=
Junio C Hamano130fcca2006-02-05 00:07:44 -080079no_edit=
80log_given=
81log_message=
82verify=t
Nicolas Pitreebd124c2006-12-14 23:15:44 -050083quiet=
Junio C Hamanocf7bb582006-02-10 00:45:59 -080084verbose=
Junio C Hamano130fcca2006-02-05 00:07:44 -080085signoff=
86force_author=
Junio C Hamanobba319b2006-02-14 12:40:20 -080087only_include_assumed=
Matthias Lederhofer443f8332006-05-22 23:02:06 +020088untracked_files=
Junio C Hamano0c091292005-08-08 17:03:14 -070089while case "$#" in 0) break;; esac
Junio C Hamano5fec3ef2005-06-25 02:22:05 -070090do
Martin Waitz3de63c32006-10-07 21:07:40 +020091 case "$1" in
92 -F|--F|-f|--f|--fi|--fil|--file)
93 case "$#" in 1) usage ;; esac
94 shift
95 no_edit=t
96 log_given=t$log_given
97 logfile="$1"
98 shift
99 ;;
100 -F*|-f*)
101 no_edit=t
102 log_given=t$log_given
103 logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
104 shift
105 ;;
106 --F=*|--f=*|--fi=*|--fil=*|--file=*)
107 no_edit=t
108 log_given=t$log_given
109 logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
110 shift
111 ;;
112 -a|--a|--al|--all)
113 all=t
114 shift
115 ;;
116 --au=*|--aut=*|--auth=*|--autho=*|--author=*)
117 force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
118 shift
119 ;;
120 --au|--aut|--auth|--autho|--author)
121 case "$#" in 1) usage ;; esac
122 shift
123 force_author="$1"
124 shift
125 ;;
126 -e|--e|--ed|--edi|--edit)
127 edit_flag=t
128 shift
129 ;;
130 -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
131 also=t
132 shift
133 ;;
134 -o|--o|--on|--onl|--only)
135 only=t
136 shift
137 ;;
138 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
139 case "$#" in 1) usage ;; esac
140 shift
141 log_given=m$log_given
142 if test "$log_message" = ''
143 then
144 log_message="$1"
145 else
146 log_message="$log_message
Shawn Pearce68912812006-05-29 04:45:49 -0400147
148$1"
Martin Waitz3de63c32006-10-07 21:07:40 +0200149 fi
150 no_edit=t
151 shift
152 ;;
153 -m*)
154 log_given=m$log_given
155 if test "$log_message" = ''
156 then
157 log_message=`expr "z$1" : 'z-m\(.*\)'`
158 else
159 log_message="$log_message
Shawn Pearce68912812006-05-29 04:45:49 -0400160
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200161`expr "z$1" : 'z-m\(.*\)'`"
Martin Waitz3de63c32006-10-07 21:07:40 +0200162 fi
163 no_edit=t
164 shift
165 ;;
166 --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
167 log_given=m$log_given
168 if test "$log_message" = ''
169 then
170 log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
171 else
172 log_message="$log_message
Shawn Pearce68912812006-05-29 04:45:49 -0400173
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200174`expr "z$1" : 'zq-[^=]*=\(.*\)'`"
Martin Waitz3de63c32006-10-07 21:07:40 +0200175 fi
176 no_edit=t
177 shift
178 ;;
179 -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\
180 --no-verify)
181 verify=
182 shift
183 ;;
184 --a|--am|--ame|--amen|--amend)
185 amend=t
186 log_given=t$log_given
187 use_commit=HEAD
188 shift
189 ;;
190 -c)
191 case "$#" in 1) usage ;; esac
192 shift
193 log_given=t$log_given
194 use_commit="$1"
195 no_edit=
196 shift
197 ;;
198 --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
199 --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
200 --reedit-messag=*|--reedit-message=*)
201 log_given=t$log_given
202 use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
203 no_edit=
204 shift
205 ;;
206 --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
207 --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\
208 --reedit-message)
209 case "$#" in 1) usage ;; esac
210 shift
211 log_given=t$log_given
212 use_commit="$1"
213 no_edit=
214 shift
215 ;;
216 -C)
217 case "$#" in 1) usage ;; esac
218 shift
219 log_given=t$log_given
220 use_commit="$1"
221 no_edit=t
222 shift
223 ;;
224 --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
225 --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
226 --reuse-message=*)
227 log_given=t$log_given
228 use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
229 no_edit=t
230 shift
231 ;;
232 --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
233 --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
234 case "$#" in 1) usage ;; esac
235 shift
236 log_given=t$log_given
237 use_commit="$1"
238 no_edit=t
239 shift
240 ;;
241 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
242 signoff=t
243 shift
244 ;;
Nicolas Pitreebd124c2006-12-14 23:15:44 -0500245 -q|--q|--qu|--qui|--quie|--quiet)
246 quiet=t
247 shift
248 ;;
Martin Waitz3de63c32006-10-07 21:07:40 +0200249 -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
250 verbose=t
251 shift
252 ;;
253 -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\
254 --untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\
255 --untracked-file|--untracked-files)
256 untracked_files=t
257 shift
258 ;;
259 --)
260 shift
261 break
262 ;;
263 -*)
264 usage
265 ;;
266 *)
267 break
268 ;;
269 esac
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700270done
Jeff Kingcda8ab52006-06-23 09:43:38 -0400271case "$edit_flag" in t) no_edit= ;; esac
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700272
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800273################################################################
274# Sanity check options
275
Junio C Hamanob4019f02006-03-02 21:04:05 -0800276case "$amend,$initial_commit" in
277t,t)
Martin Waitz3de63c32006-10-07 21:07:40 +0200278 die "You do not have anything to amend." ;;
Junio C Hamanob4019f02006-03-02 21:04:05 -0800279t,)
Martin Waitz3de63c32006-10-07 21:07:40 +0200280 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
281 die "You are in the middle of a merge -- cannot amend."
282 fi ;;
Junio C Hamanob4019f02006-03-02 21:04:05 -0800283esac
284
Junio C Hamano0c091292005-08-08 17:03:14 -0700285case "$log_given" in
286tt*)
Martin Waitz3de63c32006-10-07 21:07:40 +0200287 die "Only one of -c/-C/-F can be used." ;;
Shawn Pearce68912812006-05-29 04:45:49 -0400288*tm*|*mt*)
Martin Waitz3de63c32006-10-07 21:07:40 +0200289 die "Option -m cannot be combined with -c/-C/-F." ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700290esac
291
Junio C Hamano6a746422006-04-20 01:20:56 -0700292case "$#,$also,$only,$amend" in
293*,t,t,*)
Martin Waitz3de63c32006-10-07 21:07:40 +0200294 die "Only one of --include/--only can be used." ;;
Junio C Hamano6a746422006-04-20 01:20:56 -07002950,t,,* | 0,,t,)
Martin Waitz3de63c32006-10-07 21:07:40 +0200296 die "No paths with --include/--only does not make sense." ;;
Junio C Hamano6a746422006-04-20 01:20:56 -07002970,,t,t)
Martin Waitz3de63c32006-10-07 21:07:40 +0200298 only_include_assumed="# Clever... amending the last one with dirty index." ;;
Junio C Hamano6a746422006-04-20 01:20:56 -07002990,,,*)
Martin Waitz3de63c32006-10-07 21:07:40 +0200300 ;;
Junio C Hamano6a746422006-04-20 01:20:56 -0700301*,,,*)
Martin Waitz3de63c32006-10-07 21:07:40 +0200302 only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
303 also=
304 ;;
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800305esac
306unset only
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800307case "$all,$also,$#" in
308t,t,*)
309 die "Cannot use -a and -i at the same time." ;;
310t,,[1-9]*)
311 die "Paths with -a does not make sense." ;;
312,t,0)
313 die "No paths with -i does not make sense." ;;
314esac
315
316################################################################
317# Prepare index to have a tree to be committed
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800318
Junio C Hamano130fcca2006-02-05 00:07:44 -0800319case "$all,$also" in
Junio C Hamano130fcca2006-02-05 00:07:44 -0800320t,)
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800321 save_index &&
Junio C Hamano130fcca2006-02-05 00:07:44 -0800322 (
Junio C Hamano514c09f2007-01-12 12:49:05 -0800323 cd_to_toplevel &&
324 GIT_INDEX_FILE="$NEXT_INDEX" &&
325 export GIT_INDEX_FILE &&
Junio C Hamano130fcca2006-02-05 00:07:44 -0800326 git-diff-files --name-only -z |
327 git-update-index --remove -z --stdin
Junio C Hamano514c09f2007-01-12 12:49:05 -0800328 ) || exit
Junio C Hamano130fcca2006-02-05 00:07:44 -0800329 ;;
330,t)
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800331 save_index &&
Junio C Hamanobba319b2006-02-14 12:40:20 -0800332 git-ls-files --error-unmatch -- "$@" >/dev/null || exit
333
Junio C Hamano130fcca2006-02-05 00:07:44 -0800334 git-diff-files --name-only -z -- "$@" |
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800335 (
Junio C Hamano514c09f2007-01-12 12:49:05 -0800336 cd_to_toplevel &&
337 GIT_INDEX_FILE="$NEXT_INDEX" &&
338 export GIT_INDEX_FILE &&
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800339 git-update-index --remove -z --stdin
Junio C Hamano514c09f2007-01-12 12:49:05 -0800340 ) || exit
Junio C Hamano22cff6a2005-08-16 18:08:19 -0700341 ;;
Junio C Hamano130fcca2006-02-05 00:07:44 -0800342,)
343 case "$#" in
344 0)
Martin Waitz3de63c32006-10-07 21:07:40 +0200345 ;; # commit as-is
Junio C Hamano130fcca2006-02-05 00:07:44 -0800346 *)
Martin Waitz3de63c32006-10-07 21:07:40 +0200347 if test -f "$GIT_DIR/MERGE_HEAD"
348 then
349 refuse_partial "Cannot do a partial commit during a merge."
350 fi
351 TMP_INDEX="$GIT_DIR/tmp-index$$"
Martin Waitz3de63c32006-10-07 21:07:40 +0200352 commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800353
Junio C Hamano158d0572006-12-09 22:32:43 -0800354 # Build a temporary index and update the real index
Martin Waitz3de63c32006-10-07 21:07:40 +0200355 # the same way.
356 if test -z "$initial_commit"
357 then
358 cp "$THIS_INDEX" "$TMP_INDEX"
359 GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
360 else
361 rm -f "$TMP_INDEX"
362 fi || exit
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800363
Martin Waitz3de63c32006-10-07 21:07:40 +0200364 echo "$commit_only" |
365 GIT_INDEX_FILE="$TMP_INDEX" \
366 git-update-index --add --remove --stdin &&
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800367
Martin Waitz3de63c32006-10-07 21:07:40 +0200368 save_index &&
369 echo "$commit_only" |
370 (
371 GIT_INDEX_FILE="$NEXT_INDEX"
372 export GIT_INDEX_FILE
373 git-update-index --remove --stdin
374 ) || exit
375 ;;
Junio C Hamano130fcca2006-02-05 00:07:44 -0800376 esac
Junio C Hamanof678dd12005-11-25 13:33:14 -0800377 ;;
Junio C Hamano130fcca2006-02-05 00:07:44 -0800378esac
379
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800380################################################################
381# If we do as-is commit, the index file will be THIS_INDEX,
382# otherwise NEXT_INDEX after we make this commit. We leave
383# the index as is if we abort.
Junio C Hamano0c091292005-08-08 17:03:14 -0700384
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800385if test -f "$NEXT_INDEX"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800386then
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800387 USE_INDEX="$NEXT_INDEX"
388else
389 USE_INDEX="$THIS_INDEX"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800390fi
391
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800392GIT_INDEX_FILE="$USE_INDEX" \
Martin Waitz3de63c32006-10-07 21:07:40 +0200393 git-update-index -q $unmerged_ok_if_status --refresh || exit
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800394
395################################################################
396# If the request is status, just show it and exit.
397
398case "$0" in
399*status)
400 run_status
401 exit $?
402esac
403
404################################################################
405# Grab commit message, write out tree and make commit.
406
Junio C Hamano130fcca2006-02-05 00:07:44 -0800407if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
408then
409 if test "$TMP_INDEX"
410 then
411 GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
412 else
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800413 GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
Junio C Hamano130fcca2006-02-05 00:07:44 -0800414 fi || exit
415fi
Junio C Hamano0cfe1d32005-08-12 23:39:15 -0700416
Junio C Hamanoaba2da12005-08-25 18:57:35 -0700417if test "$log_message" != ''
418then
419 echo "$log_message"
420elif test "$logfile" != ""
421then
422 if test "$logfile" = -
423 then
424 test -t 0 &&
425 echo >&2 "(reading log message from standard input)"
426 cat
427 else
428 cat <"$logfile"
429 fi
430elif test "$use_commit" != ""
431then
432 git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
Luben Tuikova9cb3c62006-10-12 14:52:42 -0700433elif test -f "$GIT_DIR/MERGE_MSG"
Junio C Hamanoe5215802005-11-01 22:01:28 -0800434then
435 cat "$GIT_DIR/MERGE_MSG"
Junio C Hamano7d0c6882006-06-23 01:37:02 -0700436elif test -f "$GIT_DIR/SQUASH_MSG"
437then
438 cat "$GIT_DIR/SQUASH_MSG"
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700439fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamano2d569932005-08-31 17:15:25 -0700440
441case "$signoff" in
442t)
Junio C Hamanof6413392005-10-03 23:49:46 -0700443 {
444 echo
445 git-var GIT_COMMITTER_IDENT | sed -e '
446 s/>.*/>/
447 s/^/Signed-off-by: /
448 '
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700449 } >>"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamano2d569932005-08-31 17:15:25 -0700450 ;;
451esac
452
Junio C Hamano475443c2006-04-12 11:45:18 -0700453if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
Junio C Hamano2d569932005-08-31 17:15:25 -0700454 echo "#"
Alex Riesenb6ae5402006-01-05 12:44:59 +0100455 echo "# It looks like you may be committing a MERGE."
Junio C Hamano2d569932005-08-31 17:15:25 -0700456 echo "# If this is not correct, please remove the file"
457 echo "# $GIT_DIR/MERGE_HEAD"
458 echo "# and try again"
459 echo "#"
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700460fi >>"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamanoaba2da12005-08-25 18:57:35 -0700461
Junio C Hamano130fcca2006-02-05 00:07:44 -0800462# Author
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800463if test '' != "$force_author"
464then
Mark Woodingf327dbc2006-04-13 22:01:24 +0000465 GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
466 GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800467 test '' != "$GIT_AUTHOR_NAME" &&
468 test '' != "$GIT_AUTHOR_EMAIL" ||
Pavel Roskin82e5a822006-07-10 01:50:18 -0400469 die "malformed --author parameter"
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800470 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
471elif test '' != "$use_commit"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800472then
473 pick_author_script='
474 /^author /{
475 s/'\''/'\''\\'\'\''/g
476 h
477 s/^author \([^<]*\) <[^>]*> .*$/\1/
478 s/'\''/'\''\'\'\''/g
479 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
480
481 g
482 s/^author [^<]* <\([^>]*\)> .*$/\1/
483 s/'\''/'\''\'\'\''/g
484 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
485
486 g
487 s/^author [^<]* <[^>]*> \(.*\)$/\1/
488 s/'\''/'\''\'\'\''/g
489 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
490
491 q
492 }
493 '
494 set_author_env=`git-cat-file commit "$use_commit" |
495 LANG=C LC_ALL=C sed -ne "$pick_author_script"`
496 eval "$set_author_env"
497 export GIT_AUTHOR_NAME
498 export GIT_AUTHOR_EMAIL
499 export GIT_AUTHOR_DATE
Junio C Hamano130fcca2006-02-05 00:07:44 -0800500fi
501
Linus Torvalds96069cf2005-06-14 10:20:14 -0700502PARENTS="-p HEAD"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800503if test -z "$initial_commit"
Junio C Hamano8098a172005-09-30 14:26:57 -0700504then
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400505 rloga='commit'
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700506 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400507 rloga='commit (merge)'
Junio C Hamano91063bb2005-09-08 13:47:12 -0700508 PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
Junio C Hamanob4019f02006-03-02 21:04:05 -0800509 elif test -n "$amend"; then
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400510 rloga='commit (amend)'
Junio C Hamanob4019f02006-03-02 21:04:05 -0800511 PARENTS=$(git-cat-file commit HEAD |
512 sed -n -e '/^$/q' -e 's/^parent /-p /p')
Junio C Hamanoaba2da12005-08-25 18:57:35 -0700513 fi
Junio C Hamanocede7522006-09-27 02:06:31 -0700514 current="$(git-rev-parse --verify HEAD)"
Junio C Hamano8098a172005-09-30 14:26:57 -0700515else
516 if [ -z "$(git-ls-files)" ]; then
Shawn O. Pearceaeb80c72006-12-15 21:53:09 -0500517 echo >&2 'nothing to commit (use "git add file1 file2" to include for commit)'
Junio C Hamano8098a172005-09-30 14:26:57 -0700518 exit 1
519 fi
520 PARENTS=""
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400521 rloga='commit (initial)'
Junio C Hamanocede7522006-09-27 02:06:31 -0700522 current=''
Linus Torvalds96069cf2005-06-14 10:20:14 -0700523fi
Junio C Hamano130fcca2006-02-05 00:07:44 -0800524
Junio C Hamano475443c2006-04-12 11:45:18 -0700525if test -z "$no_edit"
526then
527 {
Martin Waitz88a15312006-05-26 01:42:18 +0200528 echo ""
529 echo "# Please enter the commit message for your changes."
530 echo "# (Comment lines starting with '#' will not be included)"
Junio C Hamano475443c2006-04-12 11:45:18 -0700531 test -z "$only_include_assumed" || echo "$only_include_assumed"
532 run_status
533 } >>"$GIT_DIR"/COMMIT_EDITMSG
534else
535 # we need to check if there is anything to commit
536 run_status >/dev/null
537fi
Junio C Hamano85884522006-03-04 20:36:28 -0800538if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
Linus Torvaldsa3e870f2005-05-30 12:51:00 -0700539then
Junio C Hamano7d0c6882006-06-23 01:37:02 -0700540 rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800541 run_status
Linus Torvaldsa3e870f2005-05-30 12:51:00 -0700542 exit 1
543fi
Junio C Hamano475443c2006-04-12 11:45:18 -0700544
Junio C Hamano0c091292005-08-08 17:03:14 -0700545case "$no_edit" in
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700546'')
Junio C Hamano7334f062006-02-04 22:10:32 -0800547 case "${VISUAL:-$EDITOR},$TERM" in
548 ,dumb)
549 echo >&2 "Terminal is dumb but no VISUAL nor EDITOR defined."
550 echo >&2 "Please supply the commit log message using either"
551 echo >&2 "-m or -F option. A boilerplate log message has"
552 echo >&2 "been prepared in $GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800553 exit 1
554 ;;
Junio C Hamano7334f062006-02-04 22:10:32 -0800555 esac
Seanec4e69c2006-05-13 23:09:32 -0400556 git-var GIT_AUTHOR_IDENT > /dev/null || die
557 git-var GIT_COMMITTER_IDENT > /dev/null || die
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700558 ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700559 ;;
560esac
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700561
562case "$verify" in
563t)
564 if test -x "$GIT_DIR"/hooks/commit-msg
565 then
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700566 "$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700567 fi
568esac
569
Yann Dirson29f4ad82006-06-24 00:04:05 +0200570if test -z "$no_edit"
571then
572 sed -e '
573 /^diff --git a\/.*/{
574 s///
575 q
576 }
577 /^#/d
578 ' "$GIT_DIR"/COMMIT_EDITMSG
579else
580 cat "$GIT_DIR"/COMMIT_EDITMSG
581fi |
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800582git-stripspace >"$GIT_DIR"/COMMIT_MSG
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700583
584if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
585 git-stripspace |
586 wc -l` &&
587 test 0 -lt $cnt
Junio C Hamano0c091292005-08-08 17:03:14 -0700588then
Junio C Hamano130fcca2006-02-05 00:07:44 -0800589 if test -z "$TMP_INDEX"
590 then
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800591 tree=$(GIT_INDEX_FILE="$USE_INDEX" git-write-tree)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800592 else
593 tree=$(GIT_INDEX_FILE="$TMP_INDEX" git-write-tree) &&
594 rm -f "$TMP_INDEX"
595 fi &&
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700596 commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
Shawn Pearce67644a42006-05-19 05:16:18 -0400597 rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
Junio C Hamanocede7522006-09-27 02:06:31 -0700598 git-update-ref -m "$rloga: $rlogm" HEAD $commit "$current" &&
Luben Tuikova9cb3c62006-10-12 14:52:42 -0700599 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800600 if test -f "$NEXT_INDEX"
601 then
602 mv "$NEXT_INDEX" "$THIS_INDEX"
603 else
604 : ;# happy
605 fi
Junio C Hamano0c091292005-08-08 17:03:14 -0700606else
607 echo >&2 "* no commit message? aborting commit."
608 false
609fi
Linus Torvalds170241b2005-06-19 19:57:01 -0700610ret="$?"
Junio C Hamano7d0c6882006-06-23 01:37:02 -0700611rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
Junio C Hamano1536dd9c62006-02-11 18:55:43 -0800612if test -d "$GIT_DIR/rr-cache"
613then
614 git-rerere
615fi
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700616
Nicolas Pitreebd124c2006-12-14 23:15:44 -0500617if test "$ret" = 0
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700618then
Nicolas Pitreebd124c2006-12-14 23:15:44 -0500619 if test -x "$GIT_DIR"/hooks/post-commit
620 then
621 "$GIT_DIR"/hooks/post-commit
622 fi
623 if test -z "$quiet"
624 then
625 echo "Created${initial_commit:+ initial} commit $commit"
Michael Loeffler521f9c42007-01-08 20:23:13 +0100626 git-diff-tree --shortstat --summary --root --no-commit-id HEAD --
Nicolas Pitreebd124c2006-12-14 23:15:44 -0500627 fi
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700628fi
Junio C Hamano61f5cb72006-10-24 21:48:55 -0700629
Linus Torvalds170241b2005-06-19 19:57:01 -0700630exit "$ret"