[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

git-rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t
branch=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD)

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 "$THIS_INDEX" "$NEXT_INDEX"
}

report () {
  header="#
# $1:
#   ($2)
#
"
  trailer=""
  while read status name newname
  do
    printf '%s' "$header"
    header=""
    trailer="#
"
    case "$status" in
    M ) echo "#	modified: $name";;
    D*) echo "#	deleted:  $name";;
    T ) echo "#	typechange: $name";;
    C*) echo "#	copied: $name -> $newname";;
    R*) echo "#	renamed: $name -> $newname";;
    A*) echo "#	new file: $name";;
    U ) echo "#	unmerged: $name";;
    esac
  done
  printf '%s' "$trailer"
  [ "$header" ]
}

run_status () {
    (
	# We always show status for the whole tree.
	cd "$TOP"

	IS_INITIAL="$initial_commit"
	REFERENCE=HEAD
	case "$amend" in
	t)
		# If we are amending the initial commit, there
		# is no HEAD^1.
		if git-rev-parse --verify "HEAD^1" >/dev/null 2>&1
		then
			REFERENCE="HEAD^1"
			IS_INITIAL=
		else
			IS_INITIAL=t
		fi
		;;
	esac

	# 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 "$branch" in
	refs/heads/master) ;;
	*)  echo "# On branch $branch" ;;
	esac

	if test -z "$IS_INITIAL"
	then
	    git-diff-index -M --cached --name-status \
		--diff-filter=MDTCRA $REFERENCE |
	    sed -e '
		    s/\\/\\\\/g
		    s/ /\\ /g
	    ' |
	    report "Updated but not checked in" "will commit"
	    committable="$?"
	else
	    echo '#
# Initial commit
#'
	    git-ls-files |
	    sed -e '
		    s/\\/\\\\/g
		    s/ /\\ /g
		    s/^/A /
	    ' |
	    report "Updated but not checked in" "will commit"

	    committable="$?"
	fi

	git-diff-files  --name-status |
	sed -e '
		s/\\/\\\\/g
		s/ /\\ /g
	' |
	report "Changed but not updated" \
	    "use git-update-index to mark for commit"

        option=""
        if test -z "$untracked_files"; then
            option="--directory --no-empty-directory"
        fi
	if test -f "$GIT_DIR/info/exclude"
	then
	    git-ls-files -z --others $option \
		--exclude-from="$GIT_DIR/info/exclude" \
		--exclude-per-directory=.gitignore
	else
	    git-ls-files -z --others $option \
		--exclude-per-directory=.gitignore
	fi |
	perl -e '$/ = "\0";
	    my $shown = 0;
	    while (<>) {
		chomp;
		s|\\|\\\\|g;
		s|\t|\\t|g;
		s|\n|\\n|g;
		s/^/#	/;
		if (!$shown) {
		    print "#\n# Untracked files:\n";
		    print "#   (use \"git add\" to add to commit)\n";
		    print "#\n";
		    $shown = 1;
		}
		print "$_\n";
	    }
	'

	if test -n "$verbose" -a -z "$IS_INITIAL"
	then
	    git-diff-index --cached -M -p --diff-filter=MDTCRA $REFERENCE
	fi
	case "$committable" in
	0)
		case "$amend" in
		t)
			echo "# No changes" ;;
		*)
			echo "nothing to commit" ;;
		esac
		exit 1 ;;
	esac
	exit 0
    )
}

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=
no_edit=
log_given=
log_message=
verify=t
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 "$1" : '-[Ff]\(.*\)'`
      shift
      ;;
  --F=*|--f=*|--fi=*|--fil=*|--file=*)
      no_edit=t
      log_given=t$log_given
      logfile=`expr "$1" : '-[^=]*=\(.*\)'`
      shift
      ;;
  -a|--a|--al|--all)
      all=t
      shift
      ;;
  --au=*|--aut=*|--auth=*|--autho=*|--author=*)
      force_author=`expr "$1" : '-[^=]*=\(.*\)'`
      shift
      ;;
  --au|--aut|--auth|--autho|--author)
      case "$#" in 1) usage ;; esac
      shift
      force_author="$1"
      shift
      ;;
  -e|--e|--ed|--edi|--edit)
      no_edit=
      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 "$1" : '-m\(.*\)'`
      else
          log_message="$log_message

`expr "$1" : '-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 "$1" : '-[^=]*=\(.*\)'`
      else
          log_message="$log_message

`expr "$1" : '-[^=]*=\(.*\)'`"
      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 "$1" : '-[^=]*=\(.*\)'`
      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 "$1" : '-[^=]*=\(.*\)'`
      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
      ;;
  -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

################################################################
# 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

TOP=`git-rev-parse --show-cdup`
if test -z "$TOP"
then
	TOP=./
fi

case "$all,$also" in
t,)
	save_index &&
	(
		cd "$TOP"
		GIT_INDEX_FILE="$NEXT_INDEX"
		export GIT_INDEX_FILE
		git-diff-files --name-only -z |
		git-update-index --remove -z --stdin
	)
	;;
,t)
	save_index &&
	git-ls-files --error-unmatch -- "$@" >/dev/null || exit

	git-diff-files --name-only -z -- "$@"  |
	(
		cd "$TOP"
		GIT_INDEX_FILE="$NEXT_INDEX"
		export GIT_INDEX_FILE
		git-update-index --remove -z --stdin
	)
	;;
,)
	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$$"
	    if test -z "$initial_commit"
	    then
		# make sure index is clean at the specified paths, or
		# they are additions.
		dirty_in_index=`git-diff-index --cached --name-status \
			--diff-filter=DMTU HEAD -- "$@"`
		test -z "$dirty_in_index" ||
		refuse_partial "Different in index and the last commit:
$dirty_in_index"
	    fi
	    commit_only=`git-ls-files --error-unmatch -- "$@"` || exit

	    # Build the 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
	git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
then
	cat "$GIT_DIR/MERGE_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 "malformatted --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
	}
	'
	set_author_env=`git-cat-file commit "$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
	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
		PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
	elif test -n "$amend"; then
		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
		exit 1
	fi
	PARENTS=""
	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"
	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

sed -e '
    /^diff --git a\/.*/{
	s///
	q
    }
    /^#/d
' "$GIT_DIR"/COMMIT_EDITMSG |
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 "commit: $rlogm" HEAD $commit $current &&
	rm -f -- "$GIT_DIR/MERGE_HEAD" &&
	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"
if test -d "$GIT_DIR/rr-cache"
then
	git-rerere
fi

if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
then
	"$GIT_DIR"/hooks/post-commit
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
b33e9666	9
cf7bb589 JH	10	git-rev-parse --verify HEAD >/dev/null 2>&1 \|\| initial_commit=t
	11	branch=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD)
	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 () {
cf7bb589 JH	32	cp "$THIS_INDEX" "$NEXT_INDEX"
	33	}
	34
	35	report () {
	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" ]
5a798fb5 JH	60	}
	61
	62	run_status () {
cf7bb589 JH	63	(
	64	# We always show status for the whole tree.
	65	cd "$TOP"
	66
b4019f04 JH	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
cf7bb589 JH	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
b4019f04	104	if test -z "$IS_INITIAL"
cf7bb589	105	then
9ae6be80	106	git-diff-index -M --cached --name-status \
b4019f04	107	--diff-filter=MDTCRA $REFERENCE \|
9ae6be80 JH	108	sed -e '
	109	s/\\/\\\\/g
	110	s/ /\\ /g
	111	' \|
	112	report "Updated but not checked in" "will commit"
cf7bb589 JH	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
443f8338 ML	137	option=""
	138	if test -z "$untracked_files"; then
	139	option="--directory --no-empty-directory"
	140	fi
cf7bb589 JH	141	if test -f "$GIT_DIR/info/exclude"
cf7bb589 JH	142	then
443f8338	143	git-ls-files -z --others $option \
cf7bb589 JH	144	--exclude-from="$GIT_DIR/info/exclude" \
	145	--exclude-per-directory=.gitignore
	146	else
443f8338	147	git-ls-files -z --others $option \
cf7bb589 JH	148	--exclude-per-directory=.gitignore
	149	fi \|
	150	perl -e '$/ = "\0";
	151	my $shown = 0;
	152	while (<>) {
	153	chomp;
	154	s\|\\\|\\\\\|g;
	155	s\|\t\|\\t\|g;
	156	s\|\n\|\\n\|g;
	157	s/^/# /;
	158	if (!$shown) {
	159	print "#\n# Untracked files:\n";
	160	print "# (use \"git add\" to add to commit)\n";
	161	print "#\n";
	162	$shown = 1;
	163	}
	164	print "$_\n";
	165	}
	166	'
9ae6be80	167
1fa7a68f	168	if test -n "$verbose" -a -z "$IS_INITIAL"
9ae6be80	169	then
b4019f04	170	git-diff-index --cached -M -p --diff-filter=MDTCRA $REFERENCE
9ae6be80	171	fi
cf7bb589 JH	172	case "$committable" in
cf7bb589 JH	173	0)
6a74642c JH	174	case "$amend" in
	175	t)
	176	echo "# No changes" ;;
	177	*)
	178	echo "nothing to commit" ;;
	179	esac
	180	exit 1 ;;
cf7bb589 JH	181	esac
	182	exit 0
	183	)
5a798fb5 JH	184	}
5a798fb5 JH	185
cf7bb589 JH	186	trap '
	187	test -z "$TMP_INDEX" \|\| {
	188	test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
	189	}
	190	rm -f "$NEXT_INDEX"
	191	' 0
	192
	193	################################################################
	194	# Command line argument parsing and sanity checking
	195
130fcca6 JH	196	all=
130fcca6 JH	197	also=
5a798fb5	198	only=
130fcca6 JH	199	logfile=
130fcca6 JH	200	use_commit=
b4019f04	201	amend=
130fcca6 JH	202	no_edit=
	203	log_given=
	204	log_message=
	205	verify=t
cf7bb589	206	verbose=
130fcca6 JH	207	signoff=
130fcca6 JH	208	force_author=
bba319b5	209	only_include_assumed=
443f8338	210	untracked_files=
0c091296	211	while case "$#" in 0) break;; esac
5fec3ef1	212	do
0c091296	213	case "$1" in
130fcca6 JH	214	-F\|--F\|-f\|--f\|--fi\|--fil\|--file)
	215	case "$#" in 1) usage ;; esac
	216	shift
	217	no_edit=t
	218	log_given=t$log_given
	219	logfile="$1"
	220	shift
	221	;;
	222	-F\|-f)
	223	no_edit=t
	224	log_given=t$log_given
	225	logfile=`expr "$1" : '-[Ff]\(.*\)'`
	226	shift
	227	;;
	228	--F=\|--f=\|--fi=\|--fil=\|--file=*)
	229	no_edit=t
	230	log_given=t$log_given
	231	logfile=`expr "$1" : '-[^=]=\(.\)'`
	232	shift
	233	;;
0c091296	234	-a\|--a\|--al\|--all)
130fcca6 JH	235	all=t
	236	shift
	237	;;
	238	--au=\|--aut=\|--auth=\|--autho=\|--author=*)
	239	force_author=`expr "$1" : '-[^=]=\(.\)'`
	240	shift
	241	;;
	242	--au\|--aut\|--auth\|--autho\|--author)
	243	case "$#" in 1) usage ;; esac
	244	shift
	245	force_author="$1"
	246	shift
	247	;;
	248	-e\|--e\|--ed\|--edi\|--edit)
	249	no_edit=
	250	shift
	251	;;
	252	-i\|--i\|--in\|--inc\|--incl\|--inclu\|--includ\|--include)
	253	also=t
	254	shift
	255	;;
5a798fb5 JH	256	-o\|--o\|--on\|--onl\|--only)
	257	only=t
	258	shift
	259	;;
0c091296	260	-m\|--m\|--me\|--mes\|--mess\|--messa\|--messag\|--message)
130fcca6 JH	261	case "$#" in 1) usage ;; esac
130fcca6 JH	262	shift
6891281c SP	263	log_given=m$log_given
	264	if test "$log_message" = ''
	265	then
	266	log_message="$1"
	267	else
	268	log_message="$log_message
	269
	270	$1"
	271	fi
130fcca6 JH	272	no_edit=t
	273	shift
	274	;;
	275	-m*)
6891281c SP	276	log_given=m$log_given
	277	if test "$log_message" = ''
	278	then
	279	log_message=`expr "$1" : '-m\(.*\)'`
	280	else
	281	log_message="$log_message
	282
	283	`expr "$1" : '-m\(.*\)'`"
	284	fi
130fcca6 JH	285	no_edit=t
	286	shift
	287	;;
	288	--m=\|--me=\|--mes=\|--mess=\|--messa=\|--messag=\|--message=*)
6891281c SP	289	log_given=m$log_given
	290	if test "$log_message" = ''
	291	then
	292	log_message=`expr "$1" : '-[^=]=\(.\)'`
	293	else
	294	log_message="$log_message
	295
	296	`expr "$1" : '-[^=]=\(.\)'`"
	297	fi
130fcca6 JH	298	no_edit=t
	299	shift
	300	;;
	301	-n\|--n\|--no\|--no-\|--no-v\|--no-ve\|--no-ver\|--no-veri\|--no-verif\|--no-verify)
	302	verify=
	303	shift
	304	;;
b4019f04 JH	305	--a\|--am\|--ame\|--amen\|--amend)
	306	amend=t
	307	log_given=t$log_given
	308	use_commit=HEAD
	309	shift
	310	;;
130fcca6 JH	311	-c)
	312	case "$#" in 1) usage ;; esac
	313	shift
	314	log_given=t$log_given
	315	use_commit="$1"
	316	no_edit=
	317	shift
	318	;;
	319	--ree=\|--reed=\|--reedi=\|--reedit=\|--reedit-=\|--reedit-m=\|\
0c091296 JH	320	--reedit-me=\|--reedit-mes=\|--reedit-mess=\|--reedit-messa=\|\
0c091296 JH	321	--reedit-messag=\|--reedit-message=)
130fcca6 JH	322	log_given=t$log_given
	323	use_commit=`expr "$1" : '-[^=]=\(.\)'`
	324	no_edit=
	325	shift
	326	;;
	327	--ree\|--reed\|--reedi\|--reedit\|--reedit-\|--reedit-m\|--reedit-me\|\
0c091296	328	--reedit-mes\|--reedit-mess\|--reedit-messa\|--reedit-messag\|--reedit-message)
130fcca6 JH	329	case "$#" in 1) usage ;; esac
	330	shift
	331	log_given=t$log_given
	332	use_commit="$1"
	333	no_edit=
	334	shift
	335	;;
	336	-C)
	337	case "$#" in 1) usage ;; esac
	338	shift
	339	log_given=t$log_given
	340	use_commit="$1"
	341	no_edit=t
	342	shift
	343	;;
	344	--reu=\|--reus=\|--reuse=\|--reuse-=\|--reuse-m=\|--reuse-me=\|\
0c091296 JH	345	--reuse-mes=\|--reuse-mess=\|--reuse-messa=\|--reuse-messag=\|\
0c091296 JH	346	--reuse-message=*)
130fcca6 JH	347	log_given=t$log_given
	348	use_commit=`expr "$1" : '-[^=]=\(.\)'`
	349	no_edit=t
	350	shift
	351	;;
	352	--reu\|--reus\|--reuse\|--reuse-\|--reuse-m\|--reuse-me\|--reuse-mes\|\
0c091296	353	--reuse-mess\|--reuse-messa\|--reuse-messag\|--reuse-message)
130fcca6 JH	354	case "$#" in 1) usage ;; esac
	355	shift
	356	log_given=t$log_given
	357	use_commit="$1"
	358	no_edit=t
	359	shift
	360	;;
0cfe1d30	361	-s\|--s\|--si\|--sig\|--sign\|--signo\|--signof\|--signoff)
130fcca6 JH	362	signoff=t
	363	shift
	364	;;
cf7bb589 JH	365	-v\|--v\|--ve\|--ver\|--verb\|--verbo\|--verbos\|--verbose)
	366	verbose=t
	367	shift
130fcca6	368	;;
443f8338 ML	369	-u\|--u\|--un\|--unt\|--untr\|--untra\|--untrac\|--untrack\|--untracke\|--untracked\|\
	370	--untracked-\|--untracked-f\|--untracked-fi\|--untracked-fil\|--untracked-file\|\
	371	--untracked-files)
	372	untracked_files=t
	373	shift
	374	;;
0c091296	375	--)
130fcca6 JH	376	shift
	377	break
	378	;;
0c091296	379	-*)
130fcca6 JH	380	usage
130fcca6 JH	381	;;
0c091296	382	*)
130fcca6 JH	383	break
130fcca6 JH	384	;;
0c091296	385	esac
5fec3ef1 JH	386	done
5fec3ef1 JH	387
cf7bb589 JH	388	################################################################
	389	# Sanity check options
	390
b4019f04 JH	391	case "$amend,$initial_commit" in
	392	t,t)
	393	die "You do not have anything to amend." ;;
	394	t,)
	395	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
	396	die "You are in the middle of a merge -- cannot amend."
	397	fi ;;
	398	esac
	399
0c091296 JH	400	case "$log_given" in
0c091296 JH	401	tt*)
6891281c SP	402	die "Only one of -c/-C/-F can be used." ;;
	403	tm\|mt)
	404	die "Option -m cannot be combined with -c/-C/-F." ;;
0c091296 JH	405	esac
0c091296 JH	406
6a74642c JH	407	case "$#,$also,$only,$amend" in
6a74642c JH	408	,t,t,)
5a798fb5	409	die "Only one of --include/--only can be used." ;;
6a74642c	410	0,t,,* \| 0,,t,)
5a798fb5	411	die "No paths with --include/--only does not make sense." ;;
6a74642c JH	412	0,,t,t)
	413	only_include_assumed="# Clever... amending the last one with dirty index." ;;
	414	0,,,*)
5a798fb5	415	;;
6a74642c	416	,,,)
756e3ee0	417	only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
4170a195	418	also=
5a798fb5 JH	419	;;
	420	esac
	421	unset only
cf7bb589 JH	422	case "$all,$also,$#" in
	423	t,t,*)
	424	die "Cannot use -a and -i at the same time." ;;
	425	t,,[1-9]*)
	426	die "Paths with -a does not make sense." ;;
	427	,t,0)
	428	die "No paths with -i does not make sense." ;;
	429	esac
	430
	431	################################################################
	432	# Prepare index to have a tree to be committed
5a798fb5	433
130fcca6	434	TOP=`git-rev-parse --show-cdup`
5a798fb5 JH	435	if test -z "$TOP"
	436	then
	437	TOP=./
	438	fi
130fcca6 JH	439
130fcca6 JH	440	case "$all,$also" in
130fcca6	441	t,)
5a798fb5	442	save_index &&
130fcca6	443	(
5a798fb5	444	cd "$TOP"
cf7bb589 JH	445	GIT_INDEX_FILE="$NEXT_INDEX"
cf7bb589 JH	446	export GIT_INDEX_FILE
130fcca6 JH	447	git-diff-files --name-only -z \|
	448	git-update-index --remove -z --stdin
	449	)
6a0049c0	450	;;
130fcca6	451	,t)
5a798fb5	452	save_index &&
bba319b5 JH	453	git-ls-files --error-unmatch -- "$@" >/dev/null \|\| exit
bba319b5 JH	454
130fcca6	455	git-diff-files --name-only -z -- "$@" \|
cf7bb589 JH	456	(
	457	cd "$TOP"
	458	GIT_INDEX_FILE="$NEXT_INDEX"
	459	export GIT_INDEX_FILE
	460	git-update-index --remove -z --stdin
	461	)
22cff6a5	462	;;
130fcca6 JH	463	,)
	464	case "$#" in
	465	0)
	466	;; # commit as-is
	467	*)
	468	if test -f "$GIT_DIR/MERGE_HEAD"
	469	then
	470	refuse_partial "Cannot do a partial commit during a merge."
	471	fi
	472	TMP_INDEX="$GIT_DIR/tmp-index$$"
	473	if test -z "$initial_commit"
	474	then
	475	# make sure index is clean at the specified paths, or
	476	# they are additions.
	477	dirty_in_index=`git-diff-index --cached --name-status \
5a798fb5	478	--diff-filter=DMTU HEAD -- "$@"`
130fcca6	479	test -z "$dirty_in_index" \|\|
5a798fb5	480	refuse_partial "Different in index and the last commit:
130fcca6 JH	481	$dirty_in_index"
130fcca6 JH	482	fi
bba319b5	483	commit_only=`git-ls-files --error-unmatch -- "$@"` \|\| exit
cf7bb589 JH	484
	485	# Build the temporary index and update the real index
	486	# the same way.
	487	if test -z "$initial_commit"
	488	then
	489	cp "$THIS_INDEX" "$TMP_INDEX"
	490	GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
	491	else
	492	rm -f "$TMP_INDEX"
	493	fi \|\| exit
	494
	495	echo "$commit_only" \|
	496	GIT_INDEX_FILE="$TMP_INDEX" \
	497	git-update-index --add --remove --stdin &&
	498
	499	save_index &&
	500	echo "$commit_only" \|
	501	(
	502	GIT_INDEX_FILE="$NEXT_INDEX"
	503	export GIT_INDEX_FILE
	504	git-update-index --remove --stdin
	505	) \|\| exit
	506	;;
130fcca6 JH	507	esac
	508	;;
	509	esac
	510
cf7bb589 JH	511	################################################################
	512	# If we do as-is commit, the index file will be THIS_INDEX,
	513	# otherwise NEXT_INDEX after we make this commit. We leave
	514	# the index as is if we abort.
130fcca6	515
cf7bb589	516	if test -f "$NEXT_INDEX"
130fcca6	517	then
cf7bb589 JH	518	USE_INDEX="$NEXT_INDEX"
	519	else
	520	USE_INDEX="$THIS_INDEX"
130fcca6 JH	521	fi
130fcca6 JH	522
cf7bb589 JH	523	GIT_INDEX_FILE="$USE_INDEX" \
	524	git-update-index -q $unmerged_ok_if_status --refresh \|\| exit
	525
	526	################################################################
	527	# If the request is status, just show it and exit.
	528
	529	case "$0" in
	530	*status)
	531	run_status
	532	exit $?
	533	esac
	534
	535	################################################################
	536	# Grab commit message, write out tree and make commit.
	537
130fcca6 JH	538	if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
	539	then
	540	if test "$TMP_INDEX"
	541	then
	542	GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
	543	else
cf7bb589	544	GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
130fcca6 JH	545	fi \|\| exit
130fcca6 JH	546	fi
0cfe1d30	547
aba2da13 JH	548	if test "$log_message" != ''
	549	then
	550	echo "$log_message"
	551	elif test "$logfile" != ""
	552	then
	553	if test "$logfile" = -
	554	then
	555	test -t 0 &&
	556	echo >&2 "(reading log message from standard input)"
	557	cat
	558	else
	559	cat <"$logfile"
	560	fi
	561	elif test "$use_commit" != ""
	562	then
	563	git-cat-file commit "$use_commit" \| sed -e '1,/^$/d'
e5215804 JH	564	elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
	565	then
	566	cat "$GIT_DIR/MERGE_MSG"
f8e2c54c	567	fi \| git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
2d569933 JH	568
	569	case "$signoff" in
	570	t)
f6413391 JH	571	{
	572	echo
	573	git-var GIT_COMMITTER_IDENT \| sed -e '
	574	s/>.*/>/
	575	s/^/Signed-off-by: /
	576	'
f8e2c54c	577	} >>"$GIT_DIR"/COMMIT_EDITMSG
2d569933 JH	578	;;
	579	esac
	580
475443c8	581	if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
2d569933	582	echo "#"
b6ae5409	583	echo "# It looks like you may be committing a MERGE."
2d569933 JH	584	echo "# If this is not correct, please remove the file"
	585	echo "# $GIT_DIR/MERGE_HEAD"
	586	echo "# and try again"
	587	echo "#"
f8e2c54c	588	fi >>"$GIT_DIR"/COMMIT_EDITMSG
aba2da13	589
130fcca6	590	# Author
5a798fb5 JH	591	if test '' != "$force_author"
5a798fb5 JH	592	then
f327dbce MW	593	GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.[^ ]\) <.*'` &&
f327dbce MW	594	GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.\(<.\)'` &&
5a798fb5 JH	595	test '' != "$GIT_AUTHOR_NAME" &&
	596	test '' != "$GIT_AUTHOR_EMAIL" \|\|
	597	die "malformatted --author parameter"
	598	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
	599	elif test '' != "$use_commit"
130fcca6 JH	600	then
	601	pick_author_script='
	602	/^author /{
	603	s/'\''/'\''\\'\'\''/g
	604	h
	605	s/^author \([^<]\) <[^>]> .*$/\1/
	606	s/'\''/'\''\'\'\''/g
	607	s/.*/GIT_AUTHOR_NAME='\''&'\''/p
	608
	609	g
	610	s/^author [^<]* <\([^>]\)> .$/\1/
	611	s/'\''/'\''\'\'\''/g
	612	s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
	613
	614	g
	615	s/^author [^<]* <[^>]> \(.\)$/\1/
	616	s/'\''/'\''\'\'\''/g
	617	s/.*/GIT_AUTHOR_DATE='\''&'\''/p
	618
	619	q
	620	}
	621	'
	622	set_author_env=`git-cat-file commit "$use_commit" \|
	623	LANG=C LC_ALL=C sed -ne "$pick_author_script"`
	624	eval "$set_author_env"
	625	export GIT_AUTHOR_NAME
	626	export GIT_AUTHOR_EMAIL
	627	export GIT_AUTHOR_DATE
130fcca6 JH	628	fi
130fcca6 JH	629
96069cf0	630	PARENTS="-p HEAD"
130fcca6	631	if test -z "$initial_commit"
8098a178	632	then
5fec3ef1	633	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
91063bbc	634	PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
b4019f04 JH	635	elif test -n "$amend"; then
	636	PARENTS=$(git-cat-file commit HEAD \|
	637	sed -n -e '/^$/q' -e 's/^parent /-p /p')
aba2da13	638	fi
b8310152	639	current=$(git-rev-parse --verify HEAD)
8098a178 JH	640	else
8098a178 JH	641	if [ -z "$(git-ls-files)" ]; then
5a798fb5	642	echo >&2 Nothing to commit
8098a178 JH	643	exit 1
	644	fi
	645	PARENTS=""
b8310152	646	current=
96069cf0	647	fi
130fcca6	648
475443c8 JH	649	if test -z "$no_edit"
	650	then
	651	{
88a15314 MW	652	echo ""
	653	echo "# Please enter the commit message for your changes."
	654	echo "# (Comment lines starting with '#' will not be included)"
475443c8 JH	655	test -z "$only_include_assumed" \|\| echo "$only_include_assumed"
	656	run_status
	657	} >>"$GIT_DIR"/COMMIT_EDITMSG
	658	else
	659	# we need to check if there is anything to commit
	660	run_status >/dev/null
	661	fi
8588452c	662	if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
a3e870f2	663	then
f8e2c54c	664	rm -f "$GIT_DIR/COMMIT_EDITMSG"
5a798fb5	665	run_status
a3e870f2 LT	666	exit 1
a3e870f2 LT	667	fi
475443c8	668
0c091296	669	case "$no_edit" in
5fec3ef1	670	'')
7334f06c JH	671	case "${VISUAL:-$EDITOR},$TERM" in
	672	,dumb)
	673	echo >&2 "Terminal is dumb but no VISUAL nor EDITOR defined."
	674	echo >&2 "Please supply the commit log message using either"
	675	echo >&2 "-m or -F option. A boilerplate log message has"
	676	echo >&2 "been prepared in $GIT_DIR/COMMIT_EDITMSG"
130fcca6 JH	677	exit 1
130fcca6 JH	678	;;
7334f06c	679	esac
ec4e69c0 SE	680	git-var GIT_AUTHOR_IDENT > /dev/null \|\| die
ec4e69c0 SE	681	git-var GIT_COMMITTER_IDENT > /dev/null \|\| die
f8e2c54c	682	${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
5fec3ef1 JH	683	;;
5fec3ef1 JH	684	esac
89e2c5f1 JH	685
	686	case "$verify" in
	687	t)
	688	if test -x "$GIT_DIR"/hooks/commit-msg
	689	then
f8e2c54c	690	"$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG \|\| exit
89e2c5f1 JH	691	fi
	692	esac
	693
cf7bb589	694	sed -e '
9ae6be80 JH	695	/^diff --git a\/.*/{
	696	s///
	697	q
	698	}
	699	/^#/d
cf7bb589 JH	700	' "$GIT_DIR"/COMMIT_EDITMSG \|
cf7bb589 JH	701	git-stripspace >"$GIT_DIR"/COMMIT_MSG
f8e2c54c SB	702
	703	if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG \|
	704	git-stripspace \|
	705	wc -l` &&
	706	test 0 -lt $cnt
0c091296	707	then
130fcca6 JH	708	if test -z "$TMP_INDEX"
130fcca6 JH	709	then
cf7bb589	710	tree=$(GIT_INDEX_FILE="$USE_INDEX" git-write-tree)
130fcca6 JH	711	else
	712	tree=$(GIT_INDEX_FILE="$TMP_INDEX" git-write-tree) &&
	713	rm -f "$TMP_INDEX"
	714	fi &&
f8e2c54c	715	commit=$(cat "$GIT_DIR"/COMMIT_MSG \| git-commit-tree $tree $PARENTS) &&
67644a4d SP	716	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
67644a4d SP	717	git-update-ref -m "commit: $rlogm" HEAD $commit $current &&
cf7bb589 JH	718	rm -f -- "$GIT_DIR/MERGE_HEAD" &&
	719	if test -f "$NEXT_INDEX"
	720	then
	721	mv "$NEXT_INDEX" "$THIS_INDEX"
	722	else
	723	: ;# happy
	724	fi
0c091296 JH	725	else
	726	echo >&2 "* no commit message? aborting commit."
	727	false
	728	fi
170241b7	729	ret="$?"
f8e2c54c	730	rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
1536dd9c JH	731	if test -d "$GIT_DIR/rr-cache"
	732	then
	733	git-rerere
	734	fi
89e2c5f1 JH	735
	736	if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
	737	then
	738	"$GIT_DIR"/hooks/post-commit
	739	fi
170241b7	740	exit "$ret"