3 # Copyright (c) 2005 Linus Torvalds
4 # Copyright (c) 2006 Junio C Hamano
6 USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [--template <file>] [[-i | -o] <path>...]'
11 git rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t
24 echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?"
28 THIS_INDEX="$GIT_DIR/index"
29 NEXT_INDEX="$GIT_DIR/next-index$$"
32 cp -p "$THIS_INDEX" "$NEXT_INDEX"
36 # 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"
44 GIT_INDEX_FILE="$TMP_INDEX"
46 elif test -f "$NEXT_INDEX"
48 GIT_INDEX_FILE="$NEXT_INDEX"
52 case "$status_only" in
56 git runstatus ${color} \
57 ${verbose:+--verbose} \
59 ${untracked_files:+--untracked}
63 test -z "$TMP_INDEX" || {
64 test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
69 ################################################################
70 # Command line argument parsing and sanity checking
90 templatefile="`git config commit.template`"
91 while case "$#" in 0) break;; esac
94 -F|--F|-f|--f|--fi|--fil|--file)
95 case "$#" in 1) usage ;; esac
104 log_given=t$log_given
105 logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
108 --F=*|--f=*|--fi=*|--fil=*|--file=*)
110 log_given=t$log_given
111 logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
118 --au=*|--aut=*|--auth=*|--autho=*|--author=*)
119 force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
122 --au|--aut|--auth|--autho|--author)
123 case "$#" in 1) usage ;; esac
128 -e|--e|--ed|--edi|--edit)
132 -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
136 --int|--inte|--inter|--intera|--interac|--interact|--interacti|\
137 --interactiv|--interactive)
141 -o|--o|--on|--onl|--only)
145 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
146 case "$#" in 1) usage ;; esac
148 log_given=m$log_given
149 if test "$log_message" = ''
153 log_message="$log_message
161 log_given=m$log_given
162 if test "$log_message" = ''
164 log_message=`expr "z$1" : 'z-m\(.*\)'`
166 log_message="$log_message
168 `expr "z$1" : 'z-m\(.*\)'`"
173 --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
174 log_given=m$log_given
175 if test "$log_message" = ''
177 log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
179 log_message="$log_message
181 `expr "z$1" : 'zq-[^=]*=\(.*\)'`"
186 -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\
191 --a|--am|--ame|--amen|--amend)
193 log_given=t$log_given
198 case "$#" in 1) usage ;; esac
200 log_given=t$log_given
205 --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
206 --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
207 --reedit-messag=*|--reedit-message=*)
208 log_given=t$log_given
209 use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
213 --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
214 --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\
216 case "$#" in 1) usage ;; esac
218 log_given=t$log_given
224 case "$#" in 1) usage ;; esac
226 log_given=t$log_given
231 --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
232 --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
234 log_given=t$log_given
235 use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
239 --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
240 --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
241 case "$#" in 1) usage ;; esac
243 log_given=t$log_given
248 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
252 -t|--t|--te|--tem|--temp|--templ|--templa|--templat|--template)
253 case "$#" in 1) usage ;; esac
259 -q|--q|--qu|--qui|--quie|--quiet)
263 -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
267 -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\
268 --untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\
269 --untracked-file|--untracked-files)
285 case "$edit_flag" in t) no_edit= ;; esac
287 ################################################################
288 # Sanity check options
290 case "$amend,$initial_commit" in
292 die "You do not have anything to amend." ;;
294 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
295 die "You are in the middle of a merge -- cannot amend."
301 die "Only one of -c/-C/-F/--amend can be used." ;;
303 die "Option -m cannot be combined with -c/-C/-F/--amend." ;;
306 case "$#,$also,$only,$amend" in
308 die "Only one of --include/--only can be used." ;;
310 die "No paths with --include/--only does not make sense." ;;
312 only_include_assumed="# Clever... amending the last one with dirty index." ;;
316 only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
321 case "$all,$interactive,$also,$#" in
323 die "Cannot use -a, --interactive or -i at the same time." ;;
325 die "Paths with -a does not make sense." ;;
327 die "Paths with --interactive does not make sense." ;;
329 die "No paths with -i does not make sense." ;;
332 if test ! -z "$templatefile" -a -z "$log_given"
334 if test ! -f "$templatefile"
336 die "Commit template file does not exist."
340 ################################################################
341 # Prepare index to have a tree to be committed
345 if test ! -f "$THIS_INDEX"
347 die 'nothing to commit (use "git add file1 file2" to include for commit)'
352 GIT_INDEX_FILE="$NEXT_INDEX" &&
353 export GIT_INDEX_FILE &&
354 git diff-files --name-only -z |
355 git update-index --remove -z --stdin
360 git ls-files --error-unmatch -- "$@" >/dev/null || exit
362 git diff-files --name-only -z -- "$@" |
365 GIT_INDEX_FILE="$NEXT_INDEX" &&
366 export GIT_INDEX_FILE &&
367 git update-index --remove -z --stdin
371 if test "$interactive" = t; then
372 git add --interactive || exit
378 if test -f "$GIT_DIR/MERGE_HEAD"
380 refuse_partial "Cannot do a partial commit during a merge."
382 TMP_INDEX="$GIT_DIR/tmp-index$$"
383 commit_only=`git ls-files --error-unmatch -- "$@"` || exit
385 # Build a temporary index and update the real index
387 if test -z "$initial_commit"
389 GIT_INDEX_FILE="$THIS_INDEX" \
390 git read-tree --index-output="$TMP_INDEX" -i -m HEAD
395 printf '%s\n' "$commit_only" |
396 GIT_INDEX_FILE="$TMP_INDEX" \
397 git update-index --add --remove --stdin &&
400 printf '%s\n' "$commit_only" |
402 GIT_INDEX_FILE="$NEXT_INDEX"
403 export GIT_INDEX_FILE
404 git update-index --remove --stdin
411 ################################################################
412 # If we do as-is commit, the index file will be THIS_INDEX,
413 # otherwise NEXT_INDEX after we make this commit. We leave
414 # the index as is if we abort.
416 if test -f "$NEXT_INDEX"
418 USE_INDEX="$NEXT_INDEX"
420 USE_INDEX="$THIS_INDEX"
423 case "$status_only" in
425 # This will silently fail in a read-only repository, which is
427 GIT_INDEX_FILE="$USE_INDEX" git update-index -q --unmerged --refresh
432 GIT_INDEX_FILE="$USE_INDEX" git update-index -q --refresh || exit
436 ################################################################
437 # Grab commit message, write out tree and make commit.
439 if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
443 GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
445 GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
449 if test "$log_message" != ''
451 printf '%s\n' "$log_message"
452 elif test "$logfile" != ""
454 if test "$logfile" = -
457 echo >&2 "(reading log message from standard input)"
462 elif test "$use_commit" != ""
464 encoding=$(git config i18n.commitencoding || echo UTF-8)
465 git show -s --pretty=raw --encoding="$encoding" "$use_commit" |
466 sed -e '1,/^$/d' -e 's/^ //'
467 elif test -f "$GIT_DIR/MERGE_MSG"
469 cat "$GIT_DIR/MERGE_MSG"
470 elif test -f "$GIT_DIR/SQUASH_MSG"
472 cat "$GIT_DIR/SQUASH_MSG"
473 elif test "$templatefile" != ""
476 fi | git stripspace >"$GIT_DIR"/COMMIT_EDITMSG
480 sign=$(git-var GIT_COMMITTER_IDENT | sed -e '
484 blank_before_signoff=
485 tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG |
486 grep 'Signed-off-by:' >/dev/null || blank_before_signoff='
488 tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG |
489 grep "$sign"$ >/dev/null ||
490 printf '%s%s\n' "$blank_before_signoff" "$sign" \
491 >>"$GIT_DIR"/COMMIT_EDITMSG
495 if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
497 echo "# It looks like you may be committing a MERGE."
498 echo "# If this is not correct, please remove the file"
499 printf '%s\n' "# $GIT_DIR/MERGE_HEAD"
500 echo "# and try again"
502 fi >>"$GIT_DIR"/COMMIT_EDITMSG
505 if test '' != "$use_commit"
507 eval "$(get_author_ident_from_commit "$use_commit")"
508 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
510 if test '' != "$force_author"
512 GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
513 GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
514 test '' != "$GIT_AUTHOR_NAME" &&
515 test '' != "$GIT_AUTHOR_EMAIL" ||
516 die "malformed --author parameter"
517 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
521 if test -z "$initial_commit"
524 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
525 rloga='commit (merge)'
526 PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
527 elif test -n "$amend"; then
528 rloga='commit (amend)'
529 PARENTS=$(git cat-file commit HEAD |
530 sed -n -e '/^$/q' -e 's/^parent /-p /p')
532 current="$(git rev-parse --verify HEAD)"
534 if [ -z "$(git ls-files)" ]; then
535 echo >&2 'nothing to commit (use "git add file1 file2" to include for commit)'
539 rloga='commit (initial)'
542 set_reflog_action "$rloga"
544 if test -z "$no_edit"
548 echo "# Please enter the commit message for your changes."
549 echo "# (Comment lines starting with '#' will not be included)"
550 test -z "$only_include_assumed" || echo "$only_include_assumed"
552 } >>"$GIT_DIR"/COMMIT_EDITMSG
554 # we need to check if there is anything to commit
555 run_status >/dev/null
557 if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
559 rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
566 git-var GIT_AUTHOR_IDENT > /dev/null || die
567 git-var GIT_COMMITTER_IDENT > /dev/null || die
568 git_editor "$GIT_DIR/COMMIT_EDITMSG"
574 if test -x "$GIT_DIR"/hooks/commit-msg
576 "$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
580 if test -z "$no_edit"
588 ' "$GIT_DIR"/COMMIT_EDITMSG
590 cat "$GIT_DIR"/COMMIT_EDITMSG
592 git stripspace >"$GIT_DIR"/COMMIT_MSG
594 # Test whether the commit message has any content we didn't supply.
596 grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
597 git stripspace > "$GIT_DIR"/COMMIT_BAREMSG
599 # Is the commit message totally empty?
600 if test -s "$GIT_DIR"/COMMIT_BAREMSG
602 if test "$templatefile" != ""
604 # Test whether this is just the unaltered template.
605 if cnt=`sed -e '/^#/d' < "$templatefile" |
607 diff "$GIT_DIR"/COMMIT_BAREMSG - |
614 # No template, so the content in the commit message must
615 # have come from the user.
620 rm -f "$GIT_DIR"/COMMIT_BAREMSG
622 if test "$have_commitmsg" = "t"
624 if test -z "$TMP_INDEX"
626 tree=$(GIT_INDEX_FILE="$USE_INDEX" git write-tree)
628 tree=$(GIT_INDEX_FILE="$TMP_INDEX" git write-tree) &&
631 commit=$(git commit-tree $tree $PARENTS <"$GIT_DIR/COMMIT_MSG") &&
632 rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
633 git update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
634 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
635 if test -f "$NEXT_INDEX"
637 mv "$NEXT_INDEX" "$THIS_INDEX"
642 echo >&2 "* no commit message? aborting commit."
646 rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
654 if test -x "$GIT_DIR"/hooks/post-commit
656 "$GIT_DIR"/hooks/post-commit
660 commit=`git diff-tree --always --shortstat --pretty="format:%h: %s"\
661 --summary --root HEAD --`
662 echo "Created${initial_commit:+ initial} commit $commit"