[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>) [--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"

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