[thirdparty/git.git] / git-commit.sh

#!/bin/sh
#
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2006 Junio C Hamano

USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [--template <file>] [[-i | -o] <path>...]'
SUBDIRECTORY_OK=Yes
. git-sh-setup
require_work_tree

git rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t

case "$0" in
*status)
	status_only=t
	;;
*commit)
	status_only=
	;;
esac

refuse_partial () {
	echo >&2 "$1"
	echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?"
	exit 1
}

TMP_INDEX=
THIS_INDEX="$GIT_DIR/index"
NEXT_INDEX="$GIT_DIR/next-index$$"
rm -f "$NEXT_INDEX"
save_index () {
	cp -p "$THIS_INDEX" "$NEXT_INDEX"
}

run_status () {
	# If TMP_INDEX is defined, that means we are doing
	# "--only" partial commit, and that index file is used
	# to build the tree for the commit.  Otherwise, if
	# NEXT_INDEX exists, that is the index file used to
	# make the commit.  Otherwise we are using as-is commit
	# so the regular index file is what we use to compare.
	if test '' != "$TMP_INDEX"
	then
		GIT_INDEX_FILE="$TMP_INDEX"
		export GIT_INDEX_FILE
	elif test -f "$NEXT_INDEX"
	then
		GIT_INDEX_FILE="$NEXT_INDEX"
		export GIT_INDEX_FILE
	fi

	if test "$status_only" = "t" -o "$use_status_color" = "t"; then
		color=
	else
		color=--nocolor
	fi
	git runstatus ${color} \
		${verbose:+--verbose} \
		${amend:+--amend} \
		${untracked_files:+--untracked}
}

trap '
	test -z "$TMP_INDEX" || {
		test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
	}
	rm -f "$NEXT_INDEX"
' 0

################################################################
# Command line argument parsing and sanity checking

all=
also=
interactive=
only=
logfile=
use_commit=
amend=
edit_flag=
no_edit=
log_given=
log_message=
verify=t
quiet=
verbose=
signoff=
force_author=
only_include_assumed=
untracked_files=
templatefile="`git config commit.template`"
while test $# != 0
do
	case "$1" in
	-F|--F|-f|--f|--fi|--fil|--file)
		case "$#" in 1) usage ;; esac
		shift
		no_edit=t
		log_given=t$log_given
		logfile="$1"
		shift
		;;
	-F*|-f*)
		no_edit=t
		log_given=t$log_given
		logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
		shift
		;;
	--F=*|--f=*|--fi=*|--fil=*|--file=*)
		no_edit=t
		log_given=t$log_given
		logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
		shift
		;;
	-a|--a|--al|--all)
		all=t
		shift
		;;
	--au=*|--aut=*|--auth=*|--autho=*|--author=*)
		force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
		shift
		;;
	--au|--aut|--auth|--autho|--author)
		case "$#" in 1) usage ;; esac
		shift
		force_author="$1"
		shift
		;;
	-e|--e|--ed|--edi|--edit)
		edit_flag=t
		shift
		;;
	-i|--i|--in|--inc|--incl|--inclu|--includ|--include)
		also=t
		shift
		;;
	--int|--inte|--inter|--intera|--interac|--interact|--interacti|\
	--interactiv|--interactive)
		interactive=t
		shift
		;;
	-o|--o|--on|--onl|--only)
		only=t
		shift
		;;
	-m|--m|--me|--mes|--mess|--messa|--messag|--message)
		case "$#" in 1) usage ;; esac
		shift
		log_given=m$log_given
		if test "$log_message" = ''
		then
		    log_message="$1"
		else
		    log_message="$log_message

$1"
		fi
		no_edit=t
		shift
		;;
	-m*)
		log_given=m$log_given
		if test "$log_message" = ''
		then
		    log_message=`expr "z$1" : 'z-m\(.*\)'`
		else
		    log_message="$log_message

`expr "z$1" : 'z-m\(.*\)'`"
		fi
		no_edit=t
		shift
		;;
	--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
		log_given=m$log_given
		if test "$log_message" = ''
		then
		    log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
		else
		    log_message="$log_message

`expr "z$1" : 'zq-[^=]*=\(.*\)'`"
		fi
		no_edit=t
		shift
		;;
	-n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\
	--no-verify)
		verify=
		shift
		;;
	--a|--am|--ame|--amen|--amend)
		amend=t
		use_commit=HEAD
		shift
		;;
	-c)
		case "$#" in 1) usage ;; esac
		shift
		log_given=t$log_given
		use_commit="$1"
		no_edit=
		shift
		;;
	--ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
	--reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
	--reedit-messag=*|--reedit-message=*)
		log_given=t$log_given
		use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
		no_edit=
		shift
		;;
	--ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
	--reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\
	--reedit-message)
		case "$#" in 1) usage ;; esac
		shift
		log_given=t$log_given
		use_commit="$1"
		no_edit=
		shift
		;;
	-C)
		case "$#" in 1) usage ;; esac
		shift
		log_given=t$log_given
		use_commit="$1"
		no_edit=t
		shift
		;;
	--reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
	--reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
	--reuse-message=*)
		log_given=t$log_given
		use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
		no_edit=t
		shift
		;;
	--reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
	--reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
		case "$#" in 1) usage ;; esac
		shift
		log_given=t$log_given
		use_commit="$1"
		no_edit=t
		shift
		;;
	-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
		signoff=t
		shift
		;;
	-t|--t|--te|--tem|--temp|--templ|--templa|--templat|--template)
		case "$#" in 1) usage ;; esac
		shift
		templatefile="$1"
		no_edit=
		shift
		;;
	-q|--q|--qu|--qui|--quie|--quiet)
		quiet=t
		shift
		;;
	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
		verbose=t
		shift
		;;
	-u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\
	--untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\
	--untracked-file|--untracked-files)
		untracked_files=t
		shift
		;;
	--)
		shift
		break
		;;
	-*)
		usage
		;;
	*)
		break
		;;
	esac
done
case "$edit_flag" in t) no_edit= ;; esac

################################################################
# Sanity check options

case "$amend,$initial_commit" in
t,t)
	die "You do not have anything to amend." ;;
t,)
	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
		die "You are in the middle of a merge -- cannot amend."
	fi ;;
esac

case "$log_given" in
tt*)
	die "Only one of -c/-C/-F can be used." ;;
*tm*|*mt*)
	die "Option -m cannot be combined with -c/-C/-F." ;;
esac

case "$#,$also,$only,$amend" in
*,t,t,*)
	die "Only one of --include/--only can be used." ;;
0,t,,* | 0,,t,)
	die "No paths with --include/--only does not make sense." ;;
0,,t,t)
	only_include_assumed="# Clever... amending the last one with dirty index." ;;
0,,,*)
	;;
*,,,*)
	only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
	also=
	;;
esac
unset only
case "$all,$interactive,$also,$#" in
*t,*t,*)
	die "Cannot use -a, --interactive or -i at the same time." ;;
t,,[1-9]*)
	die "Paths with -a does not make sense." ;;
,t,[1-9]*)
	die "Paths with --interactive does not make sense." ;;
,,t,0)
	die "No paths with -i does not make sense." ;;
esac

if test ! -z "$templatefile" -a -z "$log_given"
then
	if test ! -f "$templatefile"
	then
		die "Commit template file does not exist."
	fi
fi

################################################################
# Prepare index to have a tree to be committed

case "$all,$also" in
t,)
	if test ! -f "$THIS_INDEX"
	then
		die 'nothing to commit (use "git add file1 file2" to include for commit)'
	fi
	save_index &&
	(
		cd_to_toplevel &&
		GIT_INDEX_FILE="$NEXT_INDEX" &&
		export GIT_INDEX_FILE &&
		git diff-files --name-only -z |
		git update-index --remove -z --stdin
	) || exit
	;;
,t)
	save_index &&
	git ls-files --error-unmatch -- "$@" >/dev/null || exit

	git diff-files --name-only -z -- "$@"  |
	(
		cd_to_toplevel &&
		GIT_INDEX_FILE="$NEXT_INDEX" &&
		export GIT_INDEX_FILE &&
		git update-index --remove -z --stdin
	) || exit
	;;
,)
	if test "$interactive" = t; then
		git add --interactive || exit
	fi
	case "$#" in
	0)
		;; # commit as-is
	*)
		if test -f "$GIT_DIR/MERGE_HEAD"
		then
			refuse_partial "Cannot do a partial commit during a merge."
		fi

		TMP_INDEX="$GIT_DIR/tmp-index$$"
		W=
		test -z "$initial_commit" && W=--with-tree=HEAD
		commit_only=`git ls-files --error-unmatch $W -- "$@"` || exit

		# Build a temporary index and update the real index
		# the same way.
		if test -z "$initial_commit"
		then
			GIT_INDEX_FILE="$THIS_INDEX" \
			git read-tree --index-output="$TMP_INDEX" -i -m HEAD
		else
			rm -f "$TMP_INDEX"
		fi || exit

		printf '%s\n' "$commit_only" |
		GIT_INDEX_FILE="$TMP_INDEX" \
		git update-index --add --remove --stdin &&

		save_index &&
		printf '%s\n' "$commit_only" |
		(
			GIT_INDEX_FILE="$NEXT_INDEX"
			export GIT_INDEX_FILE
			git update-index --add --remove --stdin
		) || exit
		;;
	esac
	;;
esac

################################################################
# If we do as-is commit, the index file will be THIS_INDEX,
# otherwise NEXT_INDEX after we make this commit.  We leave
# the index as is if we abort.

if test -f "$NEXT_INDEX"
then
	USE_INDEX="$NEXT_INDEX"
else
	USE_INDEX="$THIS_INDEX"
fi

case "$status_only" in
t)
	# This will silently fail in a read-only repository, which is
	# what we want.
	GIT_INDEX_FILE="$USE_INDEX" git update-index -q --unmerged --refresh
	run_status
	exit $?
	;;
'')
	GIT_INDEX_FILE="$USE_INDEX" git update-index -q --refresh || exit
	;;
esac

################################################################
# Grab commit message, write out tree and make commit.

if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
then
	if test "$TMP_INDEX"
	then
		GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
	else
		GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
	fi || exit
fi

if test "$log_message" != ''
then
	printf '%s\n' "$log_message"
elif test "$logfile" != ""
then
	if test "$logfile" = -
	then
		test -t 0 &&
		echo >&2 "(reading log message from standard input)"
		cat
	else
		cat <"$logfile"
	fi
elif test "$use_commit" != ""
then
	encoding=$(git config i18n.commitencoding || echo UTF-8)
	git show -s --pretty=raw --encoding="$encoding" "$use_commit" |
	sed -e '1,/^$/d' -e 's/^    //'
elif test -f "$GIT_DIR/MERGE_MSG"
then
	cat "$GIT_DIR/MERGE_MSG"
elif test -f "$GIT_DIR/SQUASH_MSG"
then
	cat "$GIT_DIR/SQUASH_MSG"
elif test "$templatefile" != ""
then
	cat "$templatefile"
fi | git stripspace >"$GIT_DIR"/COMMIT_EDITMSG

case "$signoff" in
t)
	sign=$(git-var GIT_COMMITTER_IDENT | sed -e '
		s/>.*/>/
		s/^/Signed-off-by: /
		')
	blank_before_signoff=
	tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG |
	grep 'Signed-off-by:' >/dev/null || blank_before_signoff='
'
	tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG |
	grep "$sign"$ >/dev/null ||
	printf '%s%s\n' "$blank_before_signoff" "$sign" \
		>>"$GIT_DIR"/COMMIT_EDITMSG
	;;
esac

if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
	echo "#"
	echo "# It looks like you may be committing a MERGE."
	echo "# If this is not correct, please remove the file"
	printf '%s\n' "#	$GIT_DIR/MERGE_HEAD"
	echo "# and try again"
	echo "#"
fi >>"$GIT_DIR"/COMMIT_EDITMSG

# Author
if test '' != "$use_commit"
then
	eval "$(get_author_ident_from_commit "$use_commit")"
	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
fi
if test '' != "$force_author"
then
	GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
	GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
	test '' != "$GIT_AUTHOR_NAME" &&
	test '' != "$GIT_AUTHOR_EMAIL" ||
	die "malformed --author parameter"
	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
fi

PARENTS="-p HEAD"
if test -z "$initial_commit"
then
	rloga='commit'
	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
		rloga='commit (merge)'
		PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
	elif test -n "$amend"; then
		rloga='commit (amend)'
		PARENTS=$(git cat-file commit HEAD |
			sed -n -e '/^$/q' -e 's/^parent /-p /p')
	fi
	current="$(git rev-parse --verify HEAD)"
else
	if [ -z "$(git ls-files)" ]; then
		echo >&2 'nothing to commit (use "git add file1 file2" to include for commit)'
		exit 1
	fi
	PARENTS=""
	rloga='commit (initial)'
	current=''
fi
set_reflog_action "$rloga"

if test -z "$no_edit"
then
	{
		echo ""
		echo "# Please enter the commit message for your changes."
		echo "# (Comment lines starting with '#' will not be included)"
		test -z "$only_include_assumed" || echo "$only_include_assumed"
		run_status
	} >>"$GIT_DIR"/COMMIT_EDITMSG
else
	# we need to check if there is anything to commit
	run_status >/dev/null
fi
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
then
	rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
	use_status_color=t
	run_status
	exit 1
fi

case "$no_edit" in
'')
	git-var GIT_AUTHOR_IDENT > /dev/null  || die
	git-var GIT_COMMITTER_IDENT > /dev/null  || die
	git_editor "$GIT_DIR/COMMIT_EDITMSG"
	;;
esac

case "$verify" in
t)
	if test -x "$GIT_DIR"/hooks/commit-msg
	then
		"$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
	fi
esac

if test -z "$no_edit"
then
    sed -e '
        /^diff --git a\/.*/{
	    s///
	    q
	}
	/^#/d
    ' "$GIT_DIR"/COMMIT_EDITMSG
else
    cat "$GIT_DIR"/COMMIT_EDITMSG
fi |
git stripspace >"$GIT_DIR"/COMMIT_MSG

# Test whether the commit message has any content we didn't supply.
have_commitmsg=
grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
	git stripspace > "$GIT_DIR"/COMMIT_BAREMSG

# Is the commit message totally empty?
if test -s "$GIT_DIR"/COMMIT_BAREMSG
then
	if test "$templatefile" != ""
	then
		# Test whether this is just the unaltered template.
		if cnt=`sed -e '/^#/d' < "$templatefile" |
			git stripspace |
			diff "$GIT_DIR"/COMMIT_BAREMSG - |
			wc -l` &&
		   test 0 -lt $cnt
		then
			have_commitmsg=t
		fi
	else
		# No template, so the content in the commit message must
		# have come from the user.
		have_commitmsg=t
	fi
fi

rm -f "$GIT_DIR"/COMMIT_BAREMSG

if test "$have_commitmsg" = "t"
then
	if test -z "$TMP_INDEX"
	then
		tree=$(GIT_INDEX_FILE="$USE_INDEX" git write-tree)
	else
		tree=$(GIT_INDEX_FILE="$TMP_INDEX" git write-tree) &&
		rm -f "$TMP_INDEX"
	fi &&
	commit=$(git commit-tree $tree $PARENTS <"$GIT_DIR/COMMIT_MSG") &&
	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
	git update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
	if test -f "$NEXT_INDEX"
	then
		mv "$NEXT_INDEX" "$THIS_INDEX"
	else
		: ;# happy
	fi
else
	echo >&2 "* no commit message?  aborting commit."
	false
fi
ret="$?"
rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"

cd_to_toplevel

git rerere

if test "$ret" = 0
then
	if test -x "$GIT_DIR"/hooks/post-commit
	then
		"$GIT_DIR"/hooks/post-commit
	fi
	if test -z "$quiet"
	then
		commit=`git diff-tree --always --shortstat --pretty="format:%h: %s"\
		       --summary --root HEAD --`
		echo "Created${initial_commit:+ initial} commit $commit"
	fi
fi

exit "$ret"
Commit	Line	Data
a3e870f2	1	#!/bin/sh
5fec3ef1 JH	2	#
5fec3ef1 JH	3	# Copyright (c) 2005 Linus Torvalds
130fcca6 JH	4	# Copyright (c) 2006 Junio C Hamano
130fcca6 JH	5
d1cc130a	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>...]'
130fcca6	7	SUBDIRECTORY_OK=Yes
ae2b0f15	8	. git-sh-setup
7eff28a9	9	require_work_tree
b33e9666	10
5be60078	11	git rev-parse --verify HEAD >/dev/null 2>&1 \|\| initial_commit=t
cf7bb589 JH	12
	13	case "$0" in
	14	*status)
	15	status_only=t
2b5f9a8c	16	;;
cf7bb589 JH	17	*commit)
cf7bb589 JH	18	status_only=
2b5f9a8c	19	;;
cf7bb589	20	esac
130fcca6 JH	21
	22	refuse_partial () {
	23	echo >&2 "$1"
130fcca6 JH	24	echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?"
	25	exit 1
	26	}
	27
c8f20325	28	TMP_INDEX=
cf7bb589 JH	29	THIS_INDEX="$GIT_DIR/index"
	30	NEXT_INDEX="$GIT_DIR/next-index$$"
	31	rm -f "$NEXT_INDEX"
5a798fb5	32	save_index () {
cc7d5bcf	33	cp -p "$THIS_INDEX" "$NEXT_INDEX"
cf7bb589 JH	34	}
cf7bb589 JH	35
5a798fb5	36	run_status () {
cf7bb589 JH	37	# If TMP_INDEX is defined, that means we are doing
	38	# "--only" partial commit, and that index file is used
	39	# to build the tree for the commit. Otherwise, if
	40	# NEXT_INDEX exists, that is the index file used to
	41	# make the commit. Otherwise we are using as-is commit
	42	# so the regular index file is what we use to compare.
	43	if test '' != "$TMP_INDEX"
	44	then
3de63c3f MW	45	GIT_INDEX_FILE="$TMP_INDEX"
3de63c3f MW	46	export GIT_INDEX_FILE
cf7bb589 JH	47	elif test -f "$NEXT_INDEX"
cf7bb589 JH	48	then
3de63c3f MW	49	GIT_INDEX_FILE="$NEXT_INDEX"
3de63c3f MW	50	export GIT_INDEX_FILE
cf7bb589 JH	51	fi
cf7bb589 JH	52
09b0d9dd BH	53	if test "$status_only" = "t" -o "$use_status_color" = "t"; then
	54	color=
	55	else
	56	color=--nocolor
	57	fi
5be60078	58	git runstatus ${color} \
3de63c3f MW	59	${verbose:+--verbose} \
3de63c3f MW	60	${amend:+--amend} \
2074cb0a	61	${untracked_files:+--untracked}
5a798fb5 JH	62	}
5a798fb5 JH	63
cf7bb589 JH	64	trap '
	65	test -z "$TMP_INDEX" \|\| {
	66	test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
	67	}
	68	rm -f "$NEXT_INDEX"
	69	' 0
	70
	71	################################################################
	72	# Command line argument parsing and sanity checking
	73
130fcca6 JH	74	all=
130fcca6 JH	75	also=
6cbf07ef	76	interactive=
5a798fb5	77	only=
130fcca6 JH	78	logfile=
130fcca6 JH	79	use_commit=
b4019f04	80	amend=
cda8ab59	81	edit_flag=
130fcca6 JH	82	no_edit=
	83	log_given=
	84	log_message=
	85	verify=t
ebd124c6	86	quiet=
cf7bb589	87	verbose=
130fcca6 JH	88	signoff=
130fcca6 JH	89	force_author=
bba319b5	90	only_include_assumed=
443f8338	91	untracked_files=
d1cc130a	92	templatefile="`git config commit.template`"
822f7c73	93	while test $# != 0
5fec3ef1	94	do
3de63c3f MW	95	case "$1" in
	96	-F\|--F\|-f\|--f\|--fi\|--fil\|--file)
	97	case "$#" in 1) usage ;; esac
	98	shift
	99	no_edit=t
	100	log_given=t$log_given
	101	logfile="$1"
	102	shift
	103	;;
	104	-F\|-f)
	105	no_edit=t
	106	log_given=t$log_given
	107	logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
	108	shift
	109	;;
	110	--F=\|--f=\|--fi=\|--fil=\|--file=*)
	111	no_edit=t
	112	log_given=t$log_given
	113	logfile=`expr "z$1" : 'z-[^=]=\(.\)'`
	114	shift
	115	;;
	116	-a\|--a\|--al\|--all)
	117	all=t
	118	shift
	119	;;
	120	--au=\|--aut=\|--auth=\|--autho=\|--author=*)
	121	force_author=`expr "z$1" : 'z-[^=]=\(.\)'`
	122	shift
	123	;;
	124	--au\|--aut\|--auth\|--autho\|--author)
	125	case "$#" in 1) usage ;; esac
	126	shift
	127	force_author="$1"
	128	shift
	129	;;
	130	-e\|--e\|--ed\|--edi\|--edit)
	131	edit_flag=t
	132	shift
	133	;;
	134	-i\|--i\|--in\|--inc\|--incl\|--inclu\|--includ\|--include)
	135	also=t
	136	shift
	137	;;
6cbf07ef PB	138	--int\|--inte\|--inter\|--intera\|--interac\|--interact\|--interacti\|\
	139	--interactiv\|--interactive)
	140	interactive=t
	141	shift
	142	;;
3de63c3f MW	143	-o\|--o\|--on\|--onl\|--only)
	144	only=t
	145	shift
	146	;;
	147	-m\|--m\|--me\|--mes\|--mess\|--messa\|--messag\|--message)
	148	case "$#" in 1) usage ;; esac
	149	shift
	150	log_given=m$log_given
	151	if test "$log_message" = ''
	152	then
	153	log_message="$1"
	154	else
	155	log_message="$log_message
6891281c SP	156
6891281c SP	157	$1"
3de63c3f MW	158	fi
	159	no_edit=t
	160	shift
	161	;;
	162	-m*)
	163	log_given=m$log_given
	164	if test "$log_message" = ''
	165	then
	166	log_message=`expr "z$1" : 'z-m\(.*\)'`
	167	else
	168	log_message="$log_message
6891281c	169
8096fae7	170	`expr "z$1" : 'z-m\(.*\)'`"
3de63c3f MW	171	fi
	172	no_edit=t
	173	shift
	174	;;
	175	--m=\|--me=\|--mes=\|--mess=\|--messa=\|--messag=\|--message=*)
	176	log_given=m$log_given
	177	if test "$log_message" = ''
	178	then
	179	log_message=`expr "z$1" : 'z-[^=]=\(.\)'`
	180	else
	181	log_message="$log_message
6891281c	182
8096fae7	183	`expr "z$1" : 'zq-[^=]=\(.\)'`"
3de63c3f MW	184	fi
	185	no_edit=t
	186	shift
	187	;;
	188	-n\|--n\|--no\|--no-\|--no-v\|--no-ve\|--no-ver\|--no-veri\|--no-verif\|\
	189	--no-verify)
	190	verify=
	191	shift
	192	;;
	193	--a\|--am\|--ame\|--amen\|--amend)
	194	amend=t
3de63c3f MW	195	use_commit=HEAD
	196	shift
	197	;;
	198	-c)
	199	case "$#" in 1) usage ;; esac
	200	shift
	201	log_given=t$log_given
	202	use_commit="$1"
	203	no_edit=
	204	shift
	205	;;
	206	--ree=\|--reed=\|--reedi=\|--reedit=\|--reedit-=\|--reedit-m=\|\
	207	--reedit-me=\|--reedit-mes=\|--reedit-mess=\|--reedit-messa=\|\
	208	--reedit-messag=\|--reedit-message=)
	209	log_given=t$log_given
	210	use_commit=`expr "z$1" : 'z-[^=]=\(.\)'`
	211	no_edit=
	212	shift
	213	;;
	214	--ree\|--reed\|--reedi\|--reedit\|--reedit-\|--reedit-m\|--reedit-me\|\
	215	--reedit-mes\|--reedit-mess\|--reedit-messa\|--reedit-messag\|\
	216	--reedit-message)
	217	case "$#" in 1) usage ;; esac
	218	shift
	219	log_given=t$log_given
	220	use_commit="$1"
	221	no_edit=
	222	shift
	223	;;
	224	-C)
	225	case "$#" in 1) usage ;; esac
	226	shift
	227	log_given=t$log_given
	228	use_commit="$1"
	229	no_edit=t
	230	shift
	231	;;
	232	--reu=\|--reus=\|--reuse=\|--reuse-=\|--reuse-m=\|--reuse-me=\|\
	233	--reuse-mes=\|--reuse-mess=\|--reuse-messa=\|--reuse-messag=\|\
	234	--reuse-message=*)
	235	log_given=t$log_given
	236	use_commit=`expr "z$1" : 'z-[^=]=\(.\)'`
	237	no_edit=t
	238	shift
	239	;;
	240	--reu\|--reus\|--reuse\|--reuse-\|--reuse-m\|--reuse-me\|--reuse-mes\|\
	241	--reuse-mess\|--reuse-messa\|--reuse-messag\|--reuse-message)
	242	case "$#" in 1) usage ;; esac
	243	shift
	244	log_given=t$log_given
	245	use_commit="$1"
	246	no_edit=t
	247	shift
	248	;;
	249	-s\|--s\|--si\|--sig\|--sign\|--signo\|--signof\|--signoff)
	250	signoff=t
	251	shift
	252	;;
d1cc130a SG	253	-t\|--t\|--te\|--tem\|--temp\|--templ\|--templa\|--templat\|--template)
	254	case "$#" in 1) usage ;; esac
	255	shift
	256	templatefile="$1"
	257	no_edit=
	258	shift
	259	;;
ebd124c6 NP	260	-q\|--q\|--qu\|--qui\|--quie\|--quiet)
	261	quiet=t
	262	shift
	263	;;
3de63c3f MW	264	-v\|--v\|--ve\|--ver\|--verb\|--verbo\|--verbos\|--verbose)
	265	verbose=t
	266	shift
	267	;;
	268	-u\|--u\|--un\|--unt\|--untr\|--untra\|--untrac\|--untrack\|--untracke\|\
	269	--untracked\|--untracked-\|--untracked-f\|--untracked-fi\|--untracked-fil\|\
	270	--untracked-file\|--untracked-files)
	271	untracked_files=t
	272	shift
	273	;;
	274	--)
	275	shift
	276	break
	277	;;
	278	-*)
	279	usage
	280	;;
	281	*)
	282	break
	283	;;
	284	esac
5fec3ef1	285	done
cda8ab59	286	case "$edit_flag" in t) no_edit= ;; esac
5fec3ef1	287
cf7bb589 JH	288	################################################################
	289	# Sanity check options
	290
b4019f04 JH	291	case "$amend,$initial_commit" in
b4019f04 JH	292	t,t)
3de63c3f	293	die "You do not have anything to amend." ;;
b4019f04	294	t,)
3de63c3f MW	295	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
	296	die "You are in the middle of a merge -- cannot amend."
	297	fi ;;
b4019f04 JH	298	esac
b4019f04 JH	299
0c091296 JH	300	case "$log_given" in
0c091296 JH	301	tt*)
6d4bbebd	302	die "Only one of -c/-C/-F can be used." ;;
6891281c	303	tm\|mt)
6d4bbebd	304	die "Option -m cannot be combined with -c/-C/-F." ;;
0c091296 JH	305	esac
0c091296 JH	306
6a74642c JH	307	case "$#,$also,$only,$amend" in
6a74642c JH	308	,t,t,)
3de63c3f	309	die "Only one of --include/--only can be used." ;;
6a74642c	310	0,t,,* \| 0,,t,)
3de63c3f	311	die "No paths with --include/--only does not make sense." ;;
6a74642c	312	0,,t,t)
3de63c3f	313	only_include_assumed="# Clever... amending the last one with dirty index." ;;
6a74642c	314	0,,,*)
3de63c3f	315	;;
6a74642c	316	,,,)
3de63c3f MW	317	only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
	318	also=
	319	;;
5a798fb5 JH	320	esac
5a798fb5 JH	321	unset only
6cbf07ef PB	322	case "$all,$interactive,$also,$#" in
	323	t,t,*)
	324	die "Cannot use -a, --interactive or -i at the same time." ;;
cf7bb589 JH	325	t,,[1-9]*)
cf7bb589 JH	326	die "Paths with -a does not make sense." ;;
6cbf07ef PB	327	,t,[1-9]*)
	328	die "Paths with --interactive does not make sense." ;;
	329	,,t,0)
cf7bb589 JH	330	die "No paths with -i does not make sense." ;;
	331	esac
	332
d1cc130a SG	333	if test ! -z "$templatefile" -a -z "$log_given"
	334	then
	335	if test ! -f "$templatefile"
	336	then
	337	die "Commit template file does not exist."
	338	fi
	339	fi
	340
cf7bb589 JH	341	################################################################
cf7bb589 JH	342	# Prepare index to have a tree to be committed
5a798fb5	343
130fcca6	344	case "$all,$also" in
130fcca6	345	t,)
755b99d8 FK	346	if test ! -f "$THIS_INDEX"
	347	then
	348	die 'nothing to commit (use "git add file1 file2" to include for commit)'
	349	fi
5a798fb5	350	save_index &&
130fcca6	351	(
514c09fd JH	352	cd_to_toplevel &&
	353	GIT_INDEX_FILE="$NEXT_INDEX" &&
	354	export GIT_INDEX_FILE &&
5be60078 JH	355	git diff-files --name-only -z \|
5be60078 JH	356	git update-index --remove -z --stdin
514c09fd	357	) \|\| exit
6a0049c0	358	;;
130fcca6	359	,t)
5a798fb5	360	save_index &&
5be60078	361	git ls-files --error-unmatch -- "$@" >/dev/null \|\| exit
bba319b5	362
5be60078	363	git diff-files --name-only -z -- "$@" \|
cf7bb589	364	(
514c09fd JH	365	cd_to_toplevel &&
	366	GIT_INDEX_FILE="$NEXT_INDEX" &&
	367	export GIT_INDEX_FILE &&
5be60078	368	git update-index --remove -z --stdin
514c09fd	369	) \|\| exit
22cff6a5	370	;;
130fcca6	371	,)
6cbf07ef PB	372	if test "$interactive" = t; then
	373	git add --interactive \|\| exit
	374	fi
130fcca6 JH	375	case "$#" in
130fcca6 JH	376	0)
3de63c3f	377	;; # commit as-is
130fcca6	378	*)
3de63c3f MW	379	if test -f "$GIT_DIR/MERGE_HEAD"
	380	then
	381	refuse_partial "Cannot do a partial commit during a merge."
	382	fi
64586e75	383
3de63c3f	384	TMP_INDEX="$GIT_DIR/tmp-index$$"
64586e75 JH	385	W=
	386	test -z "$initial_commit" && W=--with-tree=HEAD
	387	commit_only=`git ls-files --error-unmatch $W -- "$@"` \|\| exit
cf7bb589	388
158d0577	389	# Build a temporary index and update the real index
3de63c3f MW	390	# the same way.
	391	if test -z "$initial_commit"
	392	then
5e7f56ac	393	GIT_INDEX_FILE="$THIS_INDEX" \
5be60078	394	git read-tree --index-output="$TMP_INDEX" -i -m HEAD
3de63c3f MW	395	else
	396	rm -f "$TMP_INDEX"
	397	fi \|\| exit
cf7bb589	398
293623ed	399	printf '%s\n' "$commit_only" \|
3de63c3f	400	GIT_INDEX_FILE="$TMP_INDEX" \
5be60078	401	git update-index --add --remove --stdin &&
cf7bb589	402
3de63c3f	403	save_index &&
293623ed	404	printf '%s\n' "$commit_only" \|
3de63c3f MW	405	(
	406	GIT_INDEX_FILE="$NEXT_INDEX"
	407	export GIT_INDEX_FILE
cba8d489	408	git update-index --add --remove --stdin
3de63c3f MW	409	) \|\| exit
3de63c3f MW	410	;;
130fcca6 JH	411	esac
	412	;;
	413	esac
	414
cf7bb589 JH	415	################################################################
	416	# If we do as-is commit, the index file will be THIS_INDEX,
	417	# otherwise NEXT_INDEX after we make this commit. We leave
	418	# the index as is if we abort.
130fcca6	419
cf7bb589	420	if test -f "$NEXT_INDEX"
130fcca6	421	then
cf7bb589 JH	422	USE_INDEX="$NEXT_INDEX"
	423	else
	424	USE_INDEX="$THIS_INDEX"
130fcca6 JH	425	fi
130fcca6 JH	426
2b5f9a8c JH	427	case "$status_only" in
	428	t)
	429	# This will silently fail in a read-only repository, which is
	430	# what we want.
5be60078	431	GIT_INDEX_FILE="$USE_INDEX" git update-index -q --unmerged --refresh
cf7bb589 JH	432	run_status
cf7bb589 JH	433	exit $?
2b5f9a8c JH	434	;;
2b5f9a8c JH	435	'')
5be60078	436	GIT_INDEX_FILE="$USE_INDEX" git update-index -q --refresh \|\| exit
2b5f9a8c	437	;;
cf7bb589 JH	438	esac
	439
	440	################################################################
	441	# Grab commit message, write out tree and make commit.
	442
130fcca6 JH	443	if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
	444	then
	445	if test "$TMP_INDEX"
	446	then
	447	GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
	448	else
cf7bb589	449	GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
130fcca6 JH	450	fi \|\| exit
130fcca6 JH	451	fi
0cfe1d30	452
aba2da13 JH	453	if test "$log_message" != ''
aba2da13 JH	454	then
293623ed	455	printf '%s\n' "$log_message"
aba2da13 JH	456	elif test "$logfile" != ""
	457	then
	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
	466	elif test "$use_commit" != ""
	467	then
e0d10e1c	468	encoding=$(git config i18n.commitencoding \|\| echo UTF-8)
5ac2715f JH	469	git show -s --pretty=raw --encoding="$encoding" "$use_commit" \|
5ac2715f JH	470	sed -e '1,/^$/d' -e 's/^ //'
a9cb3c6e	471	elif test -f "$GIT_DIR/MERGE_MSG"
e5215804 JH	472	then
e5215804 JH	473	cat "$GIT_DIR/MERGE_MSG"
7d0c6887 JH	474	elif test -f "$GIT_DIR/SQUASH_MSG"
	475	then
	476	cat "$GIT_DIR/SQUASH_MSG"
d1cc130a SG	477	elif test "$templatefile" != ""
	478	then
	479	cat "$templatefile"
5be60078	480	fi \| git stripspace >"$GIT_DIR"/COMMIT_EDITMSG
2d569933 JH	481
	482	case "$signoff" in
	483	t)
a7342913 GP	484	sign=$(git-var GIT_COMMITTER_IDENT \| sed -e '
	485	s/>.*/>/
	486	s/^/Signed-off-by: /
	487	')
	488	blank_before_signoff=
dbaa06a2	489	tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG \|
a7342913 GP	490	grep 'Signed-off-by:' >/dev/null \|\| blank_before_signoff='
	491	'
	492	tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG \|
	493	grep "$sign"$ >/dev/null \|\|
	494	printf '%s%s\n' "$blank_before_signoff" "$sign" \
	495	>>"$GIT_DIR"/COMMIT_EDITMSG
2d569933 JH	496	;;
	497	esac
	498
475443c8	499	if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
2d569933	500	echo "#"
b6ae5409	501	echo "# It looks like you may be committing a MERGE."
2d569933	502	echo "# If this is not correct, please remove the file"
293623ed	503	printf '%s\n' "# $GIT_DIR/MERGE_HEAD"
2d569933 JH	504	echo "# and try again"
2d569933 JH	505	echo "#"
f8e2c54c	506	fi >>"$GIT_DIR"/COMMIT_EDITMSG
aba2da13	507
130fcca6	508	# Author
83e24dce	509	if test '' != "$use_commit"
130fcca6	510	then
0cae2346 JS	511	eval "$(get_author_ident_from_commit "$use_commit")"
0cae2346 JS	512	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
130fcca6	513	fi
83e24dce JH	514	if test '' != "$force_author"
	515	then
	516	GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.[^ ]\) <.*'` &&
	517	GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.\(<.\)'` &&
	518	test '' != "$GIT_AUTHOR_NAME" &&
	519	test '' != "$GIT_AUTHOR_EMAIL" \|\|
	520	die "malformed --author parameter"
	521	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
	522	fi
130fcca6	523
96069cf0	524	PARENTS="-p HEAD"
130fcca6	525	if test -z "$initial_commit"
8098a178	526	then
a3a733e6	527	rloga='commit'
5fec3ef1	528	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
a3a733e6	529	rloga='commit (merge)'
91063bbc	530	PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
b4019f04	531	elif test -n "$amend"; then
a3a733e6	532	rloga='commit (amend)'
5be60078	533	PARENTS=$(git cat-file commit HEAD \|
b4019f04	534	sed -n -e '/^$/q' -e 's/^parent /-p /p')
aba2da13	535	fi
5be60078	536	current="$(git rev-parse --verify HEAD)"
8098a178	537	else
5be60078	538	if [ -z "$(git ls-files)" ]; then
aeb80c70	539	echo >&2 'nothing to commit (use "git add file1 file2" to include for commit)'
8098a178 JH	540	exit 1
	541	fi
	542	PARENTS=""
a3a733e6	543	rloga='commit (initial)'
cede7526	544	current=''
96069cf0	545	fi
23913dc7	546	set_reflog_action "$rloga"
130fcca6	547
475443c8 JH	548	if test -z "$no_edit"
	549	then
	550	{
88a15314 MW	551	echo ""
	552	echo "# Please enter the commit message for your changes."
	553	echo "# (Comment lines starting with '#' will not be included)"
475443c8 JH	554	test -z "$only_include_assumed" \|\| echo "$only_include_assumed"
	555	run_status
	556	} >>"$GIT_DIR"/COMMIT_EDITMSG
	557	else
	558	# we need to check if there is anything to commit
a6080a0a	559	run_status >/dev/null
475443c8	560	fi
4fb5fd5d	561	if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
a3e870f2	562	then
7d0c6887	563	rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
09b0d9dd	564	use_status_color=t
5a798fb5	565	run_status
a3e870f2 LT	566	exit 1
a3e870f2 LT	567	fi
475443c8	568
0c091296	569	case "$no_edit" in
5fec3ef1	570	'')
ec4e69c0 SE	571	git-var GIT_AUTHOR_IDENT > /dev/null \|\| die
ec4e69c0 SE	572	git-var GIT_COMMITTER_IDENT > /dev/null \|\| die
ef0c2abf	573	git_editor "$GIT_DIR/COMMIT_EDITMSG"
5fec3ef1 JH	574	;;
5fec3ef1 JH	575	esac
89e2c5f1 JH	576
	577	case "$verify" in
	578	t)
	579	if test -x "$GIT_DIR"/hooks/commit-msg
	580	then
f8e2c54c	581	"$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG \|\| exit
89e2c5f1 JH	582	fi
	583	esac
	584
29f4ad86 YD	585	if test -z "$no_edit"
	586	then
	587	sed -e '
	588	/^diff --git a\/.*/{
	589	s///
	590	q
	591	}
	592	/^#/d
	593	' "$GIT_DIR"/COMMIT_EDITMSG
	594	else
	595	cat "$GIT_DIR"/COMMIT_EDITMSG
	596	fi \|
5be60078	597	git stripspace >"$GIT_DIR"/COMMIT_MSG
f8e2c54c	598
d1cc130a SG	599	# Test whether the commit message has any content we didn't supply.
	600	have_commitmsg=
	601	grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG \|
	602	git stripspace > "$GIT_DIR"/COMMIT_BAREMSG
	603
	604	# Is the commit message totally empty?
	605	if test -s "$GIT_DIR"/COMMIT_BAREMSG
	606	then
	607	if test "$templatefile" != ""
	608	then
	609	# Test whether this is just the unaltered template.
	610	if cnt=`sed -e '/^#/d' < "$templatefile" \|
	611	git stripspace \|
	612	diff "$GIT_DIR"/COMMIT_BAREMSG - \|
	613	wc -l` &&
	614	test 0 -lt $cnt
	615	then
	616	have_commitmsg=t
	617	fi
	618	else
	619	# No template, so the content in the commit message must
	620	# have come from the user.
	621	have_commitmsg=t
	622	fi
	623	fi
	624
	625	rm -f "$GIT_DIR"/COMMIT_BAREMSG
	626
	627	if test "$have_commitmsg" = "t"
0c091296	628	then
130fcca6 JH	629	if test -z "$TMP_INDEX"
130fcca6 JH	630	then
5be60078	631	tree=$(GIT_INDEX_FILE="$USE_INDEX" git write-tree)
130fcca6	632	else
5be60078	633	tree=$(GIT_INDEX_FILE="$TMP_INDEX" git write-tree) &&
130fcca6 JH	634	rm -f "$TMP_INDEX"
130fcca6 JH	635	fi &&
9d6f220c	636	commit=$(git commit-tree $tree $PARENTS <"$GIT_DIR/COMMIT_MSG") &&
67644a4d	637	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
5be60078	638	git update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
a9cb3c6e	639	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
cf7bb589 JH	640	if test -f "$NEXT_INDEX"
	641	then
	642	mv "$NEXT_INDEX" "$THIS_INDEX"
	643	else
	644	: ;# happy
	645	fi
0c091296 JH	646	else
	647	echo >&2 "* no commit message? aborting commit."
	648	false
	649	fi
170241b7	650	ret="$?"
7d0c6887	651	rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
c93d88a5 JH	652
	653	cd_to_toplevel
	654
b4372ef1	655	git rerere
89e2c5f1	656
ebd124c6	657	if test "$ret" = 0
89e2c5f1	658	then
ebd124c6 NP	659	if test -x "$GIT_DIR"/hooks/post-commit
	660	then
	661	"$GIT_DIR"/hooks/post-commit
	662	fi
	663	if test -z "$quiet"
	664	then
5be60078	665	commit=`git diff-tree --always --shortstat --pretty="format:%h: %s"\
c7263d4d	666	--summary --root HEAD --`
ebd124c6	667	echo "Created${initial_commit:+ initial} commit $commit"
ebd124c6	668	fi
89e2c5f1	669	fi
61f5cb7f	670
170241b7	671	exit "$ret"