[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 -p "$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 () {
	# 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
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
      ;;
  -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

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