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

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

USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-u] [--amend] [-e] [--author <author>] [[-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
	unmerged_ok_if_status=--unmerged ;;
*commit)
	status_only=
	unmerged_ok_if_status= ;;
esac

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

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

	case "$status_only" in
	t) color= ;;
	*) color=--nocolor ;;
	esac
	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=
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=
while case "$#" in 0) break;; esac
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
		;;
	-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
		log_given=t$log_given
		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
		;;
	-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,$also,$#" in
t,t,*)
	die "Cannot use -a and -i at the same time." ;;
t,,[1-9]*)
	die "Paths with -a does not make sense." ;;
,t,0)
	die "No paths with -i does not make sense." ;;
esac

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

case "$all,$also" in
t,)
	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
	;;
,)
	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$$"
		commit_only=`git-ls-files --error-unmatch -- "$@"` || exit

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

		echo "$commit_only" |
		GIT_INDEX_FILE="$TMP_INDEX" \
		git-update-index --add --remove --stdin &&

		save_index &&
		echo "$commit_only" |
		(
			GIT_INDEX_FILE="$NEXT_INDEX"
			export GIT_INDEX_FILE
			git-update-index --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

GIT_INDEX_FILE="$USE_INDEX" \
	git-update-index -q $unmerged_ok_if_status --refresh || exit

################################################################
# If the request is status, just show it and exit.

case "$0" in
*status)
	run_status
	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
	echo "$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 repo-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"
fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG

case "$signoff" in
t)
	{
		echo
		git-var GIT_COMMITTER_IDENT | sed -e '
			s/>.*/>/
			s/^/Signed-off-by: /
		'
	} >>"$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"
	echo "#	$GIT_DIR/MERGE_HEAD"
	echo "# and try again"
	echo "#"
fi >>"$GIT_DIR"/COMMIT_EDITMSG

# Author
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
elif test '' != "$use_commit"
then
	pick_author_script='
	/^author /{
		s/'\''/'\''\\'\'\''/g
		h
		s/^author \([^<]*\) <[^>]*> .*$/\1/
		s/'\''/'\''\'\'\''/g
		s/.*/GIT_AUTHOR_NAME='\''&'\''/p

		g
		s/^author [^<]* <\([^>]*\)> .*$/\1/
		s/'\''/'\''\'\'\''/g
		s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p

		g
		s/^author [^<]* <[^>]*> \(.*\)$/\1/
		s/'\''/'\''\'\'\''/g
		s/.*/GIT_AUTHOR_DATE='\''&'\''/p

		q
	}
	'
	encoding=$(git repo-config i18n.commitencoding || echo UTF-8)
	set_author_env=`git show -s --pretty=raw --encoding="$encoding" "$use_commit" |
	LANG=C LC_ALL=C sed -ne "$pick_author_script"`
	eval "$set_author_env"
	export GIT_AUTHOR_NAME
	export GIT_AUTHOR_EMAIL
	export GIT_AUTHOR_DATE
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

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" -a -z "$amend" ]
then
	rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
	run_status
	exit 1
fi

case "$no_edit" in
'')
	case "${VISUAL:-$EDITOR},$TERM" in
	,dumb)
		echo >&2 "Terminal is dumb but no VISUAL nor EDITOR defined."
		echo >&2 "Please supply the commit log message using either"
		echo >&2 "-m or -F option.  A boilerplate log message has"
		echo >&2 "been prepared in $GIT_DIR/COMMIT_EDITMSG"
		exit 1
		;;
	esac
	git-var GIT_AUTHOR_IDENT > /dev/null  || die
	git-var GIT_COMMITTER_IDENT > /dev/null  || die
	${VISUAL:-${EDITOR:-vi}} "$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

if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
	git-stripspace |
	wc -l` &&
   test 0 -lt $cnt
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=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
	git-update-ref -m "$rloga: $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"
if test -d "$GIT_DIR/rr-cache"
then
	git-rerere
fi

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