🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v1.3.2 / . / git-commit.sh
blob: 26cd7ca54de2e0b4802546d2611cd379694ec005 [file] [log] [blame]
Linus Torvaldsa3e870f2005-05-30 19:51:00[diff] [blame]1#!/bin/sh
Junio C Hamano5fec3ef2005-06-25 09:22:05[diff] [blame]2#
3# Copyright (c) 2005 Linus Torvalds
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]4# Copyright (c) 2006 Junio C Hamano
Junio C Hamano5fec3ef2005-06-25 09:22:05[diff] [blame]5
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]6USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>) [--amend] [-e] [--author <author>] [[-i | -o] <path>...]'
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]7SUBDIRECTORY_OK=Yes
Junio C Hamanoae2b0f12005-11-24 08:12:11[diff] [blame]8. git-sh-setup
Linus Torvaldsb33e9662005-07-08 17:57:21[diff] [blame]9
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]10git-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 08:07:44[diff] [blame]21
22refuse_partial () {
23 echo >&2 "$1"
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]24 echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?"
25 exit 1
26}
27
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]28THIS_INDEX="$GIT_DIR/index"
29NEXT_INDEX="$GIT_DIR/next-index$$"
30rm -f "$NEXT_INDEX"
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]31save_index () {
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]32 cp "$THIS_INDEX" "$NEXT_INDEX"
33}
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-06 00:08:01[diff] [blame]60}
61
62run_status () {
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]63 (
64 # We always show status for the whole tree.
65 cd "$TOP"
66
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]67 IS_INITIAL="$initial_commit"
68 REFERENCE=HEAD
69 case "$amend" in
70 t)
71 # If we are amending the initial commit, there
72 # is no HEAD^1.
73 if git-rev-parse --verify "HEAD^1" >/dev/null 2>&1
74 then
75 REFERENCE="HEAD^1"
76 IS_INITIAL=
77 else
78 IS_INITIAL=t
79 fi
80 ;;
81 esac
82
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]83 # If TMP_INDEX is defined, that means we are doing
84 # "--only" partial commit, and that index file is used
85 # to build the tree for the commit. Otherwise, if
86 # NEXT_INDEX exists, that is the index file used to
87 # make the commit. Otherwise we are using as-is commit
88 # so the regular index file is what we use to compare.
89 if test '' != "$TMP_INDEX"
90 then
91 GIT_INDEX_FILE="$TMP_INDEX"
92 export GIT_INDEX_FILE
93 elif test -f "$NEXT_INDEX"
94 then
95 GIT_INDEX_FILE="$NEXT_INDEX"
96 export GIT_INDEX_FILE
97 fi
98
99 case "$branch" in
100 refs/heads/master) ;;
101 *) echo "# On branch $branch" ;;
102 esac
103
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]104 if test -z "$IS_INITIAL"
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]105 then
Junio C Hamano9ae6be82006-02-11 02:38:24[diff] [blame]106 git-diff-index -M --cached --name-status \
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]107 --diff-filter=MDTCRA $REFERENCE |
Junio C Hamano9ae6be82006-02-11 02:38:24[diff] [blame]108 sed -e '
109 s/\\/\\\\/g
110 s/ /\\ /g
111 ' |
112 report "Updated but not checked in" "will commit"
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]113 committable="$?"
114 else
115 echo '#
116# Initial commit
117#'
118 git-ls-files |
119 sed -e '
120 s/\\/\\\\/g
121 s/ /\\ /g
122 s/^/A /
123 ' |
124 report "Updated but not checked in" "will commit"
125
126 committable="$?"
127 fi
128
129 git-diff-files --name-status |
130 sed -e '
131 s/\\/\\\\/g
132 s/ /\\ /g
133 ' |
134 report "Changed but not updated" \
135 "use git-update-index to mark for commit"
136
137 if test -f "$GIT_DIR/info/exclude"
138 then
139 git-ls-files -z --others --directory \
140 --exclude-from="$GIT_DIR/info/exclude" \
141 --exclude-per-directory=.gitignore
142 else
143 git-ls-files -z --others --directory \
144 --exclude-per-directory=.gitignore
145 fi |
146 perl -e '$/ = "\0";
147 my $shown = 0;
148 while (<>) {
149 chomp;
150 s|\\|\\\\|g;
151 s|\t|\\t|g;
152 s|\n|\\n|g;
153 s/^/# /;
154 if (!$shown) {
155 print "#\n# Untracked files:\n";
156 print "# (use \"git add\" to add to commit)\n";
157 print "#\n";
158 $shown = 1;
159 }
160 print "$_\n";
161 }
162 '
Junio C Hamano9ae6be82006-02-11 02:38:24[diff] [blame]163
Yasushi SHOJI1fa7a682006-03-20 13:11:12[diff] [blame]164 if test -n "$verbose" -a -z "$IS_INITIAL"
Junio C Hamano9ae6be82006-02-11 02:38:24[diff] [blame]165 then
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]166 git-diff-index --cached -M -p --diff-filter=MDTCRA $REFERENCE
Junio C Hamano9ae6be82006-02-11 02:38:24[diff] [blame]167 fi
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]168 case "$committable" in
169 0)
Junio C Hamano6a746422006-04-20 08:20:56[diff] [blame]170 case "$amend" in
171 t)
172 echo "# No changes" ;;
173 *)
174 echo "nothing to commit" ;;
175 esac
176 exit 1 ;;
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]177 esac
178 exit 0
179 )
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]180}
181
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]182trap '
183 test -z "$TMP_INDEX" || {
184 test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
185 }
186 rm -f "$NEXT_INDEX"
187' 0
188
189################################################################
190# Command line argument parsing and sanity checking
191
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]192all=
193also=
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]194only=
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]195logfile=
196use_commit=
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]197amend=
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]198no_edit=
199log_given=
200log_message=
201verify=t
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]202verbose=
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]203signoff=
204force_author=
Junio C Hamanobba319b2006-02-14 20:40:20[diff] [blame]205only_include_assumed=
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]206while case "$#" in 0) break;; esac
Junio C Hamano5fec3ef2005-06-25 09:22:05[diff] [blame]207do
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]208 case "$1" in
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]209 -F|--F|-f|--f|--fi|--fil|--file)
210 case "$#" in 1) usage ;; esac
211 shift
212 no_edit=t
213 log_given=t$log_given
214 logfile="$1"
215 shift
216 ;;
217 -F*|-f*)
218 no_edit=t
219 log_given=t$log_given
220 logfile=`expr "$1" : '-[Ff]\(.*\)'`
221 shift
222 ;;
223 --F=*|--f=*|--fi=*|--fil=*|--file=*)
224 no_edit=t
225 log_given=t$log_given
226 logfile=`expr "$1" : '-[^=]*=\(.*\)'`
227 shift
228 ;;
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]229 -a|--a|--al|--all)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]230 all=t
231 shift
232 ;;
233 --au=*|--aut=*|--auth=*|--autho=*|--author=*)
234 force_author=`expr "$1" : '-[^=]*=\(.*\)'`
235 shift
236 ;;
237 --au|--aut|--auth|--autho|--author)
238 case "$#" in 1) usage ;; esac
239 shift
240 force_author="$1"
241 shift
242 ;;
243 -e|--e|--ed|--edi|--edit)
244 no_edit=
245 shift
246 ;;
247 -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
248 also=t
249 shift
250 ;;
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]251 -o|--o|--on|--onl|--only)
252 only=t
253 shift
254 ;;
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]255 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]256 case "$#" in 1) usage ;; esac
257 shift
258 log_given=t$log_given
259 log_message="$1"
260 no_edit=t
261 shift
262 ;;
263 -m*)
264 log_given=t$log_given
265 log_message=`expr "$1" : '-m\(.*\)'`
266 no_edit=t
267 shift
268 ;;
269 --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
270 log_given=t$log_given
271 log_message=`expr "$1" : '-[^=]*=\(.*\)'`
272 no_edit=t
273 shift
274 ;;
275 -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
276 verify=
277 shift
278 ;;
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]279 --a|--am|--ame|--amen|--amend)
280 amend=t
281 log_given=t$log_given
282 use_commit=HEAD
283 shift
284 ;;
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]285 -c)
286 case "$#" in 1) usage ;; esac
287 shift
288 log_given=t$log_given
289 use_commit="$1"
290 no_edit=
291 shift
292 ;;
293 --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]294 --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
295 --reedit-messag=*|--reedit-message=*)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]296 log_given=t$log_given
297 use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
298 no_edit=
299 shift
300 ;;
301 --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]302 --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]303 case "$#" in 1) usage ;; esac
304 shift
305 log_given=t$log_given
306 use_commit="$1"
307 no_edit=
308 shift
309 ;;
310 -C)
311 case "$#" in 1) usage ;; esac
312 shift
313 log_given=t$log_given
314 use_commit="$1"
315 no_edit=t
316 shift
317 ;;
318 --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]319 --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
320 --reuse-message=*)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]321 log_given=t$log_given
322 use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
323 no_edit=t
324 shift
325 ;;
326 --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]327 --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]328 case "$#" in 1) usage ;; esac
329 shift
330 log_given=t$log_given
331 use_commit="$1"
332 no_edit=t
333 shift
334 ;;
Junio C Hamano0cfe1d32005-08-13 06:39:15[diff] [blame]335 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]336 signoff=t
337 shift
338 ;;
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]339 -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
340 verbose=t
341 shift
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]342 ;;
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]343 --)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]344 shift
345 break
346 ;;
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]347 -*)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]348 usage
349 ;;
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]350 *)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]351 break
352 ;;
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]353 esac
Junio C Hamano5fec3ef2005-06-25 09:22:05[diff] [blame]354done
355
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]356################################################################
357# Sanity check options
358
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]359case "$amend,$initial_commit" in
360t,t)
361 die "You do not have anything to amend." ;;
362t,)
363 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
364 die "You are in the middle of a merge -- cannot amend."
365 fi ;;
366esac
367
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]368case "$log_given" in
369tt*)
370 die "Only one of -c/-C/-F/-m can be used." ;;
371esac
372
Junio C Hamano6a746422006-04-20 08:20:56[diff] [blame]373case "$#,$also,$only,$amend" in
374*,t,t,*)
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]375 die "Only one of --include/--only can be used." ;;
Junio C Hamano6a746422006-04-20 08:20:56[diff] [blame]3760,t,,* | 0,,t,)
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]377 die "No paths with --include/--only does not make sense." ;;
Junio C Hamano6a746422006-04-20 08:20:56[diff] [blame]3780,,t,t)
379 only_include_assumed="# Clever... amending the last one with dirty index." ;;
3800,,,*)
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]381 ;;
Junio C Hamano6a746422006-04-20 08:20:56[diff] [blame]382*,,,*)
Junio C Hamano756e3ee2006-02-15 01:51:02[diff] [blame]383 only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
Junio C Hamano4170a192006-02-13 07:55:07[diff] [blame]384 also=
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]385 ;;
386esac
387unset only
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]388case "$all,$also,$#" in
389t,t,*)
390 die "Cannot use -a and -i at the same time." ;;
391t,,[1-9]*)
392 die "Paths with -a does not make sense." ;;
393,t,0)
394 die "No paths with -i does not make sense." ;;
395esac
396
397################################################################
398# Prepare index to have a tree to be committed
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]399
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]400TOP=`git-rev-parse --show-cdup`
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]401if test -z "$TOP"
402then
403 TOP=./
404fi
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]405
406case "$all,$also" in
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]407t,)
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]408 save_index &&
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]409 (
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]410 cd "$TOP"
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]411 GIT_INDEX_FILE="$NEXT_INDEX"
412 export GIT_INDEX_FILE
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]413 git-diff-files --name-only -z |
414 git-update-index --remove -z --stdin
415 )
416 ;;
417,t)
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]418 save_index &&
Junio C Hamanobba319b2006-02-14 20:40:20[diff] [blame]419 git-ls-files --error-unmatch -- "$@" >/dev/null || exit
420
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]421 git-diff-files --name-only -z -- "$@" |
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]422 (
423 cd "$TOP"
424 GIT_INDEX_FILE="$NEXT_INDEX"
425 export GIT_INDEX_FILE
426 git-update-index --remove -z --stdin
427 )
Junio C Hamano22cff6a2005-08-17 01:08:19[diff] [blame]428 ;;
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]429,)
430 case "$#" in
431 0)
432 ;; # commit as-is
433 *)
434 if test -f "$GIT_DIR/MERGE_HEAD"
435 then
436 refuse_partial "Cannot do a partial commit during a merge."
437 fi
438 TMP_INDEX="$GIT_DIR/tmp-index$$"
439 if test -z "$initial_commit"
440 then
441 # make sure index is clean at the specified paths, or
442 # they are additions.
443 dirty_in_index=`git-diff-index --cached --name-status \
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]444 --diff-filter=DMTU HEAD -- "$@"`
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]445 test -z "$dirty_in_index" ||
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]446 refuse_partial "Different in index and the last commit:
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]447$dirty_in_index"
448 fi
Junio C Hamanobba319b2006-02-14 20:40:20[diff] [blame]449 commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]450
451 # Build the temporary index and update the real index
452 # the same way.
453 if test -z "$initial_commit"
454 then
455 cp "$THIS_INDEX" "$TMP_INDEX"
456 GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
457 else
458 rm -f "$TMP_INDEX"
459 fi || exit
460
461 echo "$commit_only" |
462 GIT_INDEX_FILE="$TMP_INDEX" \
463 git-update-index --add --remove --stdin &&
464
465 save_index &&
466 echo "$commit_only" |
467 (
468 GIT_INDEX_FILE="$NEXT_INDEX"
469 export GIT_INDEX_FILE
470 git-update-index --remove --stdin
471 ) || exit
472 ;;
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]473 esac
Junio C Hamanof678dd12005-11-25 21:33:14[diff] [blame]474 ;;
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]475esac
476
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]477################################################################
478# If we do as-is commit, the index file will be THIS_INDEX,
479# otherwise NEXT_INDEX after we make this commit. We leave
480# the index as is if we abort.
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]481
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]482if test -f "$NEXT_INDEX"
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]483then
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]484 USE_INDEX="$NEXT_INDEX"
485else
486 USE_INDEX="$THIS_INDEX"
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]487fi
488
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]489GIT_INDEX_FILE="$USE_INDEX" \
490 git-update-index -q $unmerged_ok_if_status --refresh || exit
491
492################################################################
493# If the request is status, just show it and exit.
494
495case "$0" in
496*status)
497 run_status
498 exit $?
499esac
500
501################################################################
502# Grab commit message, write out tree and make commit.
503
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]504if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
505then
506 if test "$TMP_INDEX"
507 then
508 GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
509 else
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]510 GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]511 fi || exit
512fi
Junio C Hamano0cfe1d32005-08-13 06:39:15[diff] [blame]513
Junio C Hamanoaba2da12005-08-26 01:57:35[diff] [blame]514if test "$log_message" != ''
515then
516 echo "$log_message"
517elif test "$logfile" != ""
518then
519 if test "$logfile" = -
520 then
521 test -t 0 &&
522 echo >&2 "(reading log message from standard input)"
523 cat
524 else
525 cat <"$logfile"
526 fi
527elif test "$use_commit" != ""
528then
529 git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
Junio C Hamanoe5215802005-11-02 06:01:28[diff] [blame]530elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
531then
532 cat "$GIT_DIR/MERGE_MSG"
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]533fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamano2d569932005-09-01 00:15:25[diff] [blame]534
535case "$signoff" in
536t)
Junio C Hamanof6413392005-10-04 06:49:46[diff] [blame]537 {
538 echo
539 git-var GIT_COMMITTER_IDENT | sed -e '
540 s/>.*/>/
541 s/^/Signed-off-by: /
542 '
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]543 } >>"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamano2d569932005-09-01 00:15:25[diff] [blame]544 ;;
545esac
546
Junio C Hamano475443c2006-04-12 18:45:18[diff] [blame]547if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
Junio C Hamano2d569932005-09-01 00:15:25[diff] [blame]548 echo "#"
Alex Riesenb6ae5402006-01-05 11:44:59[diff] [blame]549 echo "# It looks like you may be committing a MERGE."
Junio C Hamano2d569932005-09-01 00:15:25[diff] [blame]550 echo "# If this is not correct, please remove the file"
551 echo "# $GIT_DIR/MERGE_HEAD"
552 echo "# and try again"
553 echo "#"
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]554fi >>"$GIT_DIR"/COMMIT_EDITMSG
Junio C Hamanoaba2da12005-08-26 01:57:35[diff] [blame]555
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]556# Author
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]557if test '' != "$force_author"
558then
Mark Woodingf327dbc2006-04-13 22:01:24[diff] [blame]559 GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
560 GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]561 test '' != "$GIT_AUTHOR_NAME" &&
562 test '' != "$GIT_AUTHOR_EMAIL" ||
563 die "malformatted --author parameter"
564 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
565elif test '' != "$use_commit"
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]566then
567 pick_author_script='
568 /^author /{
569 s/'\''/'\''\\'\'\''/g
570 h
571 s/^author \([^<]*\) <[^>]*> .*$/\1/
572 s/'\''/'\''\'\'\''/g
573 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
574
575 g
576 s/^author [^<]* <\([^>]*\)> .*$/\1/
577 s/'\''/'\''\'\'\''/g
578 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
579
580 g
581 s/^author [^<]* <[^>]*> \(.*\)$/\1/
582 s/'\''/'\''\'\'\''/g
583 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
584
585 q
586 }
587 '
588 set_author_env=`git-cat-file commit "$use_commit" |
589 LANG=C LC_ALL=C sed -ne "$pick_author_script"`
590 eval "$set_author_env"
591 export GIT_AUTHOR_NAME
592 export GIT_AUTHOR_EMAIL
593 export GIT_AUTHOR_DATE
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]594fi
595
Linus Torvalds96069cf2005-06-14 17:20:14[diff] [blame]596PARENTS="-p HEAD"
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]597if test -z "$initial_commit"
Junio C Hamano8098a172005-09-30 21:26:57[diff] [blame]598then
Junio C Hamano5fec3ef2005-06-25 09:22:05[diff] [blame]599 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
Junio C Hamano91063bb2005-09-08 20:47:12[diff] [blame]600 PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
Junio C Hamanob4019f02006-03-03 05:04:05[diff] [blame]601 elif test -n "$amend"; then
602 PARENTS=$(git-cat-file commit HEAD |
603 sed -n -e '/^$/q' -e 's/^parent /-p /p')
Junio C Hamanoaba2da12005-08-26 01:57:35[diff] [blame]604 fi
Junio C Hamanob8310152006-03-03 05:13:24[diff] [blame]605 current=$(git-rev-parse --verify HEAD)
Junio C Hamano8098a172005-09-30 21:26:57[diff] [blame]606else
607 if [ -z "$(git-ls-files)" ]; then
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]608 echo >&2 Nothing to commit
Junio C Hamano8098a172005-09-30 21:26:57[diff] [blame]609 exit 1
610 fi
611 PARENTS=""
Junio C Hamanob8310152006-03-03 05:13:24[diff] [blame]612 current=
Linus Torvalds96069cf2005-06-14 17:20:14[diff] [blame]613fi
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]614
Junio C Hamano475443c2006-04-12 18:45:18[diff] [blame]615if test -z "$no_edit"
616then
617 {
618 test -z "$only_include_assumed" || echo "$only_include_assumed"
619 run_status
620 } >>"$GIT_DIR"/COMMIT_EDITMSG
621else
622 # we need to check if there is anything to commit
623 run_status >/dev/null
624fi
Junio C Hamano85884522006-03-05 04:36:28[diff] [blame]625if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
Linus Torvaldsa3e870f2005-05-30 19:51:00[diff] [blame]626then
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]627 rm -f "$GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano5a798fb2006-02-06 00:08:01[diff] [blame]628 run_status
Linus Torvaldsa3e870f2005-05-30 19:51:00[diff] [blame]629 exit 1
630fi
Junio C Hamano475443c2006-04-12 18:45:18[diff] [blame]631
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]632case "$no_edit" in
Junio C Hamano5fec3ef2005-06-25 09:22:05[diff] [blame]633'')
Junio C Hamano7334f062006-02-05 06:10:32[diff] [blame]634 case "${VISUAL:-$EDITOR},$TERM" in
635 ,dumb)
636 echo >&2 "Terminal is dumb but no VISUAL nor EDITOR defined."
637 echo >&2 "Please supply the commit log message using either"
638 echo >&2 "-m or -F option. A boilerplate log message has"
639 echo >&2 "been prepared in $GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]640 exit 1
641 ;;
Junio C Hamano7334f062006-02-05 06:10:32[diff] [blame]642 esac
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]643 ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano5fec3ef2005-06-25 09:22:05[diff] [blame]644 ;;
645esac
Junio C Hamano89e2c5f2005-08-19 00:20:08[diff] [blame]646
647case "$verify" in
648t)
649 if test -x "$GIT_DIR"/hooks/commit-msg
650 then
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]651 "$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
Junio C Hamano89e2c5f2005-08-19 00:20:08[diff] [blame]652 fi
653esac
654
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]655sed -e '
Junio C Hamano9ae6be82006-02-11 02:38:24[diff] [blame]656 /^diff --git a\/.*/{
657 s///
658 q
659 }
660 /^#/d
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]661' "$GIT_DIR"/COMMIT_EDITMSG |
662git-stripspace >"$GIT_DIR"/COMMIT_MSG
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]663
664if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
665 git-stripspace |
666 wc -l` &&
667 test 0 -lt $cnt
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]668then
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]669 if test -z "$TMP_INDEX"
670 then
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]671 tree=$(GIT_INDEX_FILE="$USE_INDEX" git-write-tree)
Junio C Hamano130fcca2006-02-05 08:07:44[diff] [blame]672 else
673 tree=$(GIT_INDEX_FILE="$TMP_INDEX" git-write-tree) &&
674 rm -f "$TMP_INDEX"
675 fi &&
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]676 commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
Junio C Hamanobf7960e2005-09-28 01:14:27[diff] [blame]677 git-update-ref HEAD $commit $current &&
Junio C Hamanocf7bb582006-02-10 08:45:59[diff] [blame]678 rm -f -- "$GIT_DIR/MERGE_HEAD" &&
679 if test -f "$NEXT_INDEX"
680 then
681 mv "$NEXT_INDEX" "$THIS_INDEX"
682 else
683 : ;# happy
684 fi
Junio C Hamano0c091292005-08-09 00:03:14[diff] [blame]685else
686 echo >&2 "* no commit message? aborting commit."
687 false
688fi
Linus Torvalds170241b2005-06-20 02:57:01[diff] [blame]689ret="$?"
Santi_Béjarf8e2c542005-10-10 00:30:19[diff] [blame]690rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
Junio C Hamano1536dd9c62006-02-12 02:55:43[diff] [blame]691if test -d "$GIT_DIR/rr-cache"
692then
693 git-rerere
694fi
Junio C Hamano89e2c5f2005-08-19 00:20:08[diff] [blame]695
696if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
697then
698 "$GIT_DIR"/hooks/post-commit
699fi
Linus Torvalds170241b2005-06-20 02:57:01[diff] [blame]700exit "$ret"