blob: ee5a165e74a4d3a0d204ebe10650688050547b90 [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
Linus Torvaldsb33e9662005-07-08 10:57:21 -07009
Junio C Hamanocf7bb582006-02-10 00:45:59 -080010git-rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t
11branch=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD)
12
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
35report () {
36 header="#
37# $1:
38# ($2)
39#
40"
41 trailer=""
42 while read status name newname
43 do
44 printf '%s' "$header"
45 header=""
46 trailer="#
47"
48 case "$status" in
49 M ) echo "# modified: $name";;
50 D*) echo "# deleted: $name";;
51 T ) echo "# typechange: $name";;
52 C*) echo "# copied: $name -> $newname";;
53 R*) echo "# renamed: $name -> $newname";;
54 A*) echo "# new file: $name";;
55 U ) echo "# unmerged: $name";;
56 esac
57 done
58 printf '%s' "$trailer"
59 [ "$header" ]
Junio C Hamano5a798fb2006-02-05 16:08:01 -080060}
61
62run_status () {
Junio C Hamanocf7bb582006-02-10 00:45:59 -080063 # If TMP_INDEX is defined, that means we are doing
64 # "--only" partial commit, and that index file is used
65 # to build the tree for the commit. Otherwise, if
66 # NEXT_INDEX exists, that is the index file used to
67 # make the commit. Otherwise we are using as-is commit
68 # so the regular index file is what we use to compare.
69 if test '' != "$TMP_INDEX"
70 then
71 GIT_INDEX_FILE="$TMP_INDEX"
72 export GIT_INDEX_FILE
73 elif test -f "$NEXT_INDEX"
74 then
75 GIT_INDEX_FILE="$NEXT_INDEX"
76 export GIT_INDEX_FILE
77 fi
78
Jeff Kingc91f0d92006-09-08 04:05:34 -040079 case "$status_only" in
80 t) color= ;;
81 *) color=--nocolor ;;
82 esac
83 git-runstatus ${color} \
84 ${verbose:+--verbose} \
Johannes Schindelin2074cb02006-09-12 22:45:12 +020085 ${amend:+--amend} \
86 ${untracked_files:+--untracked}
Junio C Hamano5a798fb2006-02-05 16:08:01 -080087}
88
Junio C Hamanocf7bb582006-02-10 00:45:59 -080089trap '
90 test -z "$TMP_INDEX" || {
91 test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
92 }
93 rm -f "$NEXT_INDEX"
94' 0
95
96################################################################
97# Command line argument parsing and sanity checking
98
Junio C Hamano130fcca2006-02-05 00:07:44 -080099all=
100also=
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800101only=
Junio C Hamano130fcca2006-02-05 00:07:44 -0800102logfile=
103use_commit=
Junio C Hamanob4019f02006-03-02 21:04:05 -0800104amend=
Jeff Kingcda8ab52006-06-23 09:43:38 -0400105edit_flag=
Junio C Hamano130fcca2006-02-05 00:07:44 -0800106no_edit=
107log_given=
108log_message=
109verify=t
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800110verbose=
Junio C Hamano130fcca2006-02-05 00:07:44 -0800111signoff=
112force_author=
Junio C Hamanobba319b2006-02-14 12:40:20 -0800113only_include_assumed=
Matthias Lederhofer443f8332006-05-22 23:02:06 +0200114untracked_files=
Junio C Hamano0c091292005-08-08 17:03:14 -0700115while case "$#" in 0) break;; esac
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700116do
Junio C Hamano0c091292005-08-08 17:03:14 -0700117 case "$1" in
Junio C Hamano130fcca2006-02-05 00:07:44 -0800118 -F|--F|-f|--f|--fi|--fil|--file)
119 case "$#" in 1) usage ;; esac
120 shift
121 no_edit=t
122 log_given=t$log_given
123 logfile="$1"
124 shift
125 ;;
126 -F*|-f*)
127 no_edit=t
128 log_given=t$log_given
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200129 logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
Junio C Hamano130fcca2006-02-05 00:07:44 -0800130 shift
131 ;;
132 --F=*|--f=*|--fi=*|--fil=*|--file=*)
133 no_edit=t
134 log_given=t$log_given
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200135 logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
Junio C Hamano130fcca2006-02-05 00:07:44 -0800136 shift
137 ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700138 -a|--a|--al|--all)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800139 all=t
140 shift
141 ;;
142 --au=*|--aut=*|--auth=*|--autho=*|--author=*)
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200143 force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
Junio C Hamano130fcca2006-02-05 00:07:44 -0800144 shift
145 ;;
146 --au|--aut|--auth|--autho|--author)
147 case "$#" in 1) usage ;; esac
148 shift
149 force_author="$1"
150 shift
151 ;;
152 -e|--e|--ed|--edi|--edit)
Jeff Kingcda8ab52006-06-23 09:43:38 -0400153 edit_flag=t
Junio C Hamano130fcca2006-02-05 00:07:44 -0800154 shift
155 ;;
156 -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
157 also=t
158 shift
159 ;;
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800160 -o|--o|--on|--onl|--only)
161 only=t
162 shift
163 ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700164 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800165 case "$#" in 1) usage ;; esac
166 shift
Shawn Pearce68912812006-05-29 04:45:49 -0400167 log_given=m$log_given
168 if test "$log_message" = ''
169 then
170 log_message="$1"
171 else
172 log_message="$log_message
173
174$1"
175 fi
Junio C Hamano130fcca2006-02-05 00:07:44 -0800176 no_edit=t
177 shift
178 ;;
179 -m*)
Shawn Pearce68912812006-05-29 04:45:49 -0400180 log_given=m$log_given
181 if test "$log_message" = ''
182 then
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200183 log_message=`expr "z$1" : 'z-m\(.*\)'`
Shawn Pearce68912812006-05-29 04:45:49 -0400184 else
185 log_message="$log_message
186
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200187`expr "z$1" : 'z-m\(.*\)'`"
Shawn Pearce68912812006-05-29 04:45:49 -0400188 fi
Junio C Hamano130fcca2006-02-05 00:07:44 -0800189 no_edit=t
190 shift
191 ;;
192 --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
Shawn Pearce68912812006-05-29 04:45:49 -0400193 log_given=m$log_given
194 if test "$log_message" = ''
195 then
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200196 log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
Shawn Pearce68912812006-05-29 04:45:49 -0400197 else
198 log_message="$log_message
199
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200200`expr "z$1" : 'zq-[^=]*=\(.*\)'`"
Shawn Pearce68912812006-05-29 04:45:49 -0400201 fi
Junio C Hamano130fcca2006-02-05 00:07:44 -0800202 no_edit=t
203 shift
204 ;;
205 -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
206 verify=
207 shift
208 ;;
Junio C Hamanob4019f02006-03-02 21:04:05 -0800209 --a|--am|--ame|--amen|--amend)
210 amend=t
211 log_given=t$log_given
212 use_commit=HEAD
213 shift
214 ;;
Junio C Hamano130fcca2006-02-05 00:07:44 -0800215 -c)
216 case "$#" in 1) usage ;; esac
217 shift
218 log_given=t$log_given
219 use_commit="$1"
220 no_edit=
221 shift
222 ;;
223 --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
Junio C Hamano0c091292005-08-08 17:03:14 -0700224 --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
225 --reedit-messag=*|--reedit-message=*)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800226 log_given=t$log_given
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200227 use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
Junio C Hamano130fcca2006-02-05 00:07:44 -0800228 no_edit=
229 shift
230 ;;
231 --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
Junio C Hamano0c091292005-08-08 17:03:14 -0700232 --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800233 case "$#" in 1) usage ;; esac
234 shift
235 log_given=t$log_given
236 use_commit="$1"
237 no_edit=
238 shift
239 ;;
240 -C)
241 case "$#" in 1) usage ;; esac
242 shift
243 log_given=t$log_given
244 use_commit="$1"
245 no_edit=t
246 shift
247 ;;
248 --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
Junio C Hamano0c091292005-08-08 17:03:14 -0700249 --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
250 --reuse-message=*)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800251 log_given=t$log_given
Dennis Stosberg8096fae2006-06-27 18:54:26 +0200252 use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
Junio C Hamano130fcca2006-02-05 00:07:44 -0800253 no_edit=t
254 shift
255 ;;
256 --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
Junio C Hamano0c091292005-08-08 17:03:14 -0700257 --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800258 case "$#" in 1) usage ;; esac
259 shift
260 log_given=t$log_given
261 use_commit="$1"
262 no_edit=t
263 shift
264 ;;
Junio C Hamano0cfe1d32005-08-12 23:39:15 -0700265 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800266 signoff=t
267 shift
268 ;;
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800269 -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
270 verbose=t
271 shift
Junio C Hamano130fcca2006-02-05 00:07:44 -0800272 ;;
Matthias Lederhofer443f8332006-05-22 23:02:06 +0200273 -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|--untracked|\
274 --untracked-|--untracked-f|--untracked-fi|--untracked-fil|--untracked-file|\
275 --untracked-files)
276 untracked_files=t
277 shift
278 ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700279 --)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800280 shift
281 break
282 ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700283 -*)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800284 usage
285 ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700286 *)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800287 break
288 ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700289 esac
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700290done
Jeff Kingcda8ab52006-06-23 09:43:38 -0400291case "$edit_flag" in t) no_edit= ;; esac
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700292
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800293################################################################
294# Sanity check options
295
Junio C Hamanob4019f02006-03-02 21:04:05 -0800296case "$amend,$initial_commit" in
297t,t)
298 die "You do not have anything to amend." ;;
299t,)
300 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
301 die "You are in the middle of a merge -- cannot amend."
302 fi ;;
303esac
304
Junio C Hamano0c091292005-08-08 17:03:14 -0700305case "$log_given" in
306tt*)
Shawn Pearce68912812006-05-29 04:45:49 -0400307 die "Only one of -c/-C/-F can be used." ;;
308*tm*|*mt*)
309 die "Option -m cannot be combined with -c/-C/-F." ;;
Junio C Hamano0c091292005-08-08 17:03:14 -0700310esac
311
Junio C Hamano6a746422006-04-20 01:20:56 -0700312case "$#,$also,$only,$amend" in
313*,t,t,*)
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800314 die "Only one of --include/--only can be used." ;;
Junio C Hamano6a746422006-04-20 01:20:56 -07003150,t,,* | 0,,t,)
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800316 die "No paths with --include/--only does not make sense." ;;
Junio C Hamano6a746422006-04-20 01:20:56 -07003170,,t,t)
318 only_include_assumed="# Clever... amending the last one with dirty index." ;;
3190,,,*)
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800320 ;;
Junio C Hamano6a746422006-04-20 01:20:56 -0700321*,,,*)
Junio C Hamano756e3ee2006-02-14 17:51:02 -0800322 only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
Junio C Hamano4170a192006-02-12 23:55:07 -0800323 also=
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800324 ;;
325esac
326unset only
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800327case "$all,$also,$#" in
328t,t,*)
329 die "Cannot use -a and -i at the same time." ;;
330t,,[1-9]*)
331 die "Paths with -a does not make sense." ;;
332,t,0)
333 die "No paths with -i does not make sense." ;;
334esac
335
336################################################################
337# Prepare index to have a tree to be committed
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800338
Junio C Hamano130fcca2006-02-05 00:07:44 -0800339TOP=`git-rev-parse --show-cdup`
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800340if test -z "$TOP"
341then
342 TOP=./
343fi
Junio C Hamano130fcca2006-02-05 00:07:44 -0800344
345case "$all,$also" in
Junio C Hamano130fcca2006-02-05 00:07:44 -0800346t,)
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800347 save_index &&
Junio C Hamano130fcca2006-02-05 00:07:44 -0800348 (
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800349 cd "$TOP"
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800350 GIT_INDEX_FILE="$NEXT_INDEX"
351 export GIT_INDEX_FILE
Junio C Hamano130fcca2006-02-05 00:07:44 -0800352 git-diff-files --name-only -z |
353 git-update-index --remove -z --stdin
354 )
355 ;;
356,t)
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800357 save_index &&
Junio C Hamanobba319b2006-02-14 12:40:20 -0800358 git-ls-files --error-unmatch -- "$@" >/dev/null || exit
359
Junio C Hamano130fcca2006-02-05 00:07:44 -0800360 git-diff-files --name-only -z -- "$@" |
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800361 (
362 cd "$TOP"
363 GIT_INDEX_FILE="$NEXT_INDEX"
364 export GIT_INDEX_FILE
365 git-update-index --remove -z --stdin
366 )
Junio C Hamano22cff6a2005-08-16 18:08:19 -0700367 ;;
Junio C Hamano130fcca2006-02-05 00:07:44 -0800368,)
369 case "$#" in
370 0)
371 ;; # commit as-is
372 *)
373 if test -f "$GIT_DIR/MERGE_HEAD"
374 then
375 refuse_partial "Cannot do a partial commit during a merge."
376 fi
377 TMP_INDEX="$GIT_DIR/tmp-index$$"
378 if test -z "$initial_commit"
379 then
380 # make sure index is clean at the specified paths, or
381 # they are additions.
382 dirty_in_index=`git-diff-index --cached --name-status \
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800383 --diff-filter=DMTU HEAD -- "$@"`
Junio C Hamano130fcca2006-02-05 00:07:44 -0800384 test -z "$dirty_in_index" ||
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800385 refuse_partial "Different in index and the last commit:
Junio C Hamano130fcca2006-02-05 00:07:44 -0800386$dirty_in_index"
387 fi
Junio C Hamanobba319b2006-02-14 12:40:20 -0800388 commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800389
390 # Build the temporary index and update the real index
391 # the same way.
392 if test -z "$initial_commit"
393 then
394 cp "$THIS_INDEX" "$TMP_INDEX"
395 GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
396 else
397 rm -f "$TMP_INDEX"
398 fi || exit
399
400 echo "$commit_only" |
401 GIT_INDEX_FILE="$TMP_INDEX" \
402 git-update-index --add --remove --stdin &&
403
404 save_index &&
405 echo "$commit_only" |
406 (
407 GIT_INDEX_FILE="$NEXT_INDEX"
408 export GIT_INDEX_FILE
409 git-update-index --remove --stdin
410 ) || exit
411 ;;
Junio C Hamano130fcca2006-02-05 00:07:44 -0800412 esac
Junio C Hamanof678dd12005-11-25 13:33:14 -0800413 ;;
Junio C Hamano130fcca2006-02-05 00:07:44 -0800414esac
415
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800416################################################################
417# If we do as-is commit, the index file will be THIS_INDEX,
418# otherwise NEXT_INDEX after we make this commit. We leave
419# the index as is if we abort.
Junio C Hamano0c091292005-08-08 17:03:14 -0700420
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800421if test -f "$NEXT_INDEX"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800422then
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800423 USE_INDEX="$NEXT_INDEX"
424else
425 USE_INDEX="$THIS_INDEX"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800426fi
427
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800428GIT_INDEX_FILE="$USE_INDEX" \
429 git-update-index -q $unmerged_ok_if_status --refresh || exit
430
431################################################################
432# If the request is status, just show it and exit.
433
434case "$0" in
435*status)
436 run_status
437 exit $?
438esac
439
440################################################################
441# Grab commit message, write out tree and make commit.
442
Junio C Hamano130fcca2006-02-05 00:07:44 -0800443if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
444then
445 if test "$TMP_INDEX"
446 then
447 GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
448 else
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800449 GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
Junio C Hamano130fcca2006-02-05 00:07:44 -0800450 fi || exit
451fi
Junio C Hamano0cfe1d32005-08-12 23:39:15 -0700452
Junio C Hamanoaba2da12005-08-25 18:57:35 -0700453if test "$log_message" != ''
454then
455 echo "$log_message"
456elif test "$logfile" != ""
457then
458 if test "$logfile" = -
459 then
460 test -t 0 &&
461 echo >&2 "(reading log message from standard input)"
462 cat
463 else
464 cat <"$logfile"
465 fi
466elif test "$use_commit" != ""
467then
468 git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
Junio C Hamanoe5215802005-11-01 22:01:28 -0800469elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
470then
471 cat "$GIT_DIR/MERGE_MSG"
Junio C Hamano7d0c6882006-06-23 01:37:02 -0700472elif test -f "$GIT_DIR/SQUASH_MSG"
473then
474 cat "$GIT_DIR/SQUASH_MSG"
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700475fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamano2d569932005-08-31 17:15:25 -0700476
477case "$signoff" in
478t)
Junio C Hamanof6413392005-10-03 23:49:46 -0700479 {
480 echo
481 git-var GIT_COMMITTER_IDENT | sed -e '
482 s/>.*/>/
483 s/^/Signed-off-by: /
484 '
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700485 } >>"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamano2d569932005-08-31 17:15:25 -0700486 ;;
487esac
488
Junio C Hamano475443c2006-04-12 11:45:18 -0700489if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
Junio C Hamano2d569932005-08-31 17:15:25 -0700490 echo "#"
Alex Riesenb6ae5402006-01-05 12:44:59 +0100491 echo "# It looks like you may be committing a MERGE."
Junio C Hamano2d569932005-08-31 17:15:25 -0700492 echo "# If this is not correct, please remove the file"
493 echo "# $GIT_DIR/MERGE_HEAD"
494 echo "# and try again"
495 echo "#"
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700496fi >>"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamanoaba2da12005-08-25 18:57:35 -0700497
Junio C Hamano130fcca2006-02-05 00:07:44 -0800498# Author
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800499if test '' != "$force_author"
500then
Mark Woodingf327dbc2006-04-13 22:01:24 +0000501 GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
502 GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800503 test '' != "$GIT_AUTHOR_NAME" &&
504 test '' != "$GIT_AUTHOR_EMAIL" ||
Pavel Roskin82e5a822006-07-10 01:50:18 -0400505 die "malformed --author parameter"
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800506 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
507elif test '' != "$use_commit"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800508then
509 pick_author_script='
510 /^author /{
511 s/'\''/'\''\\'\'\''/g
512 h
513 s/^author \([^<]*\) <[^>]*> .*$/\1/
514 s/'\''/'\''\'\'\''/g
515 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
516
517 g
518 s/^author [^<]* <\([^>]*\)> .*$/\1/
519 s/'\''/'\''\'\'\''/g
520 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
521
522 g
523 s/^author [^<]* <[^>]*> \(.*\)$/\1/
524 s/'\''/'\''\'\'\''/g
525 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
526
527 q
528 }
529 '
530 set_author_env=`git-cat-file commit "$use_commit" |
531 LANG=C LC_ALL=C sed -ne "$pick_author_script"`
532 eval "$set_author_env"
533 export GIT_AUTHOR_NAME
534 export GIT_AUTHOR_EMAIL
535 export GIT_AUTHOR_DATE
Junio C Hamano130fcca2006-02-05 00:07:44 -0800536fi
537
Linus Torvalds96069cf2005-06-14 10:20:14 -0700538PARENTS="-p HEAD"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800539if test -z "$initial_commit"
Junio C Hamano8098a172005-09-30 14:26:57 -0700540then
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400541 rloga='commit'
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700542 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400543 rloga='commit (merge)'
Junio C Hamano91063bb2005-09-08 13:47:12 -0700544 PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
Junio C Hamanob4019f02006-03-02 21:04:05 -0800545 elif test -n "$amend"; then
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400546 rloga='commit (amend)'
Junio C Hamanob4019f02006-03-02 21:04:05 -0800547 PARENTS=$(git-cat-file commit HEAD |
548 sed -n -e '/^$/q' -e 's/^parent /-p /p')
Junio C Hamanoaba2da12005-08-25 18:57:35 -0700549 fi
Junio C Hamanocede7522006-09-27 02:06:31 -0700550 current="$(git-rev-parse --verify HEAD)"
Junio C Hamano8098a172005-09-30 14:26:57 -0700551else
552 if [ -z "$(git-ls-files)" ]; then
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800553 echo >&2 Nothing to commit
Junio C Hamano8098a172005-09-30 14:26:57 -0700554 exit 1
555 fi
556 PARENTS=""
Shawn Pearcea3a733e2006-07-10 22:48:47 -0400557 rloga='commit (initial)'
Junio C Hamanocede7522006-09-27 02:06:31 -0700558 current=''
Linus Torvalds96069cf2005-06-14 10:20:14 -0700559fi
Junio C Hamano130fcca2006-02-05 00:07:44 -0800560
Junio C Hamano475443c2006-04-12 11:45:18 -0700561if test -z "$no_edit"
562then
563 {
Martin Waitz88a15312006-05-26 01:42:18 +0200564 echo ""
565 echo "# Please enter the commit message for your changes."
566 echo "# (Comment lines starting with '#' will not be included)"
Junio C Hamano475443c2006-04-12 11:45:18 -0700567 test -z "$only_include_assumed" || echo "$only_include_assumed"
568 run_status
569 } >>"$GIT_DIR"/COMMIT_EDITMSG
570else
571 # we need to check if there is anything to commit
572 run_status >/dev/null
573fi
Junio C Hamano85884522006-03-04 20:36:28 -0800574if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
Linus Torvaldsa3e870f2005-05-30 12:51:00 -0700575then
Junio C Hamano7d0c6882006-06-23 01:37:02 -0700576 rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
Junio C Hamano5a798fb2006-02-05 16:08:01 -0800577 run_status
Linus Torvaldsa3e870f2005-05-30 12:51:00 -0700578 exit 1
579fi
Junio C Hamano475443c2006-04-12 11:45:18 -0700580
Junio C Hamano0c091292005-08-08 17:03:14 -0700581case "$no_edit" in
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700582'')
Junio C Hamano7334f062006-02-04 22:10:32 -0800583 case "${VISUAL:-$EDITOR},$TERM" in
584 ,dumb)
585 echo >&2 "Terminal is dumb but no VISUAL nor EDITOR defined."
586 echo >&2 "Please supply the commit log message using either"
587 echo >&2 "-m or -F option. A boilerplate log message has"
588 echo >&2 "been prepared in $GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano130fcca2006-02-05 00:07:44 -0800589 exit 1
590 ;;
Junio C Hamano7334f062006-02-04 22:10:32 -0800591 esac
Seanec4e69c2006-05-13 23:09:32 -0400592 git-var GIT_AUTHOR_IDENT > /dev/null || die
593 git-var GIT_COMMITTER_IDENT > /dev/null || die
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700594 ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano5fec3ef2005-06-25 02:22:05 -0700595 ;;
596esac
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700597
598case "$verify" in
599t)
600 if test -x "$GIT_DIR"/hooks/commit-msg
601 then
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700602 "$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700603 fi
604esac
605
Yann Dirson29f4ad82006-06-24 00:04:05 +0200606if test -z "$no_edit"
607then
608 sed -e '
609 /^diff --git a\/.*/{
610 s///
611 q
612 }
613 /^#/d
614 ' "$GIT_DIR"/COMMIT_EDITMSG
615else
616 cat "$GIT_DIR"/COMMIT_EDITMSG
617fi |
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800618git-stripspace >"$GIT_DIR"/COMMIT_MSG
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700619
620if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
621 git-stripspace |
622 wc -l` &&
623 test 0 -lt $cnt
Junio C Hamano0c091292005-08-08 17:03:14 -0700624then
Junio C Hamano130fcca2006-02-05 00:07:44 -0800625 if test -z "$TMP_INDEX"
626 then
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800627 tree=$(GIT_INDEX_FILE="$USE_INDEX" git-write-tree)
Junio C Hamano130fcca2006-02-05 00:07:44 -0800628 else
629 tree=$(GIT_INDEX_FILE="$TMP_INDEX" git-write-tree) &&
630 rm -f "$TMP_INDEX"
631 fi &&
Santi_Béjarf8e2c542005-10-09 17:30:19 -0700632 commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
Shawn Pearce67644a42006-05-19 05:16:18 -0400633 rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
Junio C Hamanocede7522006-09-27 02:06:31 -0700634 git-update-ref -m "$rloga: $rlogm" HEAD $commit "$current" &&
Junio C Hamanocf7bb582006-02-10 00:45:59 -0800635 rm -f -- "$GIT_DIR/MERGE_HEAD" &&
636 if test -f "$NEXT_INDEX"
637 then
638 mv "$NEXT_INDEX" "$THIS_INDEX"
639 else
640 : ;# happy
641 fi
Junio C Hamano0c091292005-08-08 17:03:14 -0700642else
643 echo >&2 "* no commit message? aborting commit."
644 false
645fi
Linus Torvalds170241b2005-06-19 19:57:01 -0700646ret="$?"
Junio C Hamano7d0c6882006-06-23 01:37:02 -0700647rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
Junio C Hamano1536dd9c62006-02-11 18:55:43 -0800648if test -d "$GIT_DIR/rr-cache"
649then
650 git-rerere
651fi
Junio C Hamano89e2c5f2005-08-18 17:20:08 -0700652
653if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
654then
655 "$GIT_DIR"/hooks/post-commit
656fi
Linus Torvalds170241b2005-06-19 19:57:01 -0700657exit "$ret"