X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-commit-script;h=5c5f564a28e779de333ea96c35c95993f7535869;hb=58eaf287f1b25f6427b06bd72d8e555615828aeb;hp=f8d568ce88ff1e372b94c6dbfaeded149dcf103f;hpb=a3e870f2e2bcacc80d5b81d7b77c15a7928a9082;p=git.git

diff --git a/git-commit-script b/git-commit-script
index f8d568ce..5c5f564a 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -1,15 +1,243 @@
 #!/bin/sh
-git-status-script > .editmsg
-if [ "$?" != "0" ]
+#
+# Copyright (c) 2005 Linus Torvalds
+#
+
+. git-sh-setup-script || die "Not a git archive"
+
+usage () {
+	die 'git commit [-a] [-v | --no-verify]  [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
+}
+
+all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
+while case "$#" in 0) break;; esac
+do
+  case "$1" in
+  -a|--a|--al|--all)
+    all=t
+    shift ;;
+  -F=*|--f=*|--fi=*|--fil=*|--file=*)
+    log_given=t$log_given
+    logfile=`expr "$1" : '-[^=]*=\(.*\)'`
+    no_edit=t
+    shift ;;
+  -F|--f|--fi|--fil|--file)
+    case "$#" in 1) usage ;; esac; shift
+    log_given=t$log_given
+    logfile="$1"
+    no_edit=t
+    shift ;;
+  -m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
+    log_given=t$log_given
+    log_message=`expr "$1" : '-[^=]*=\(.*\)'`
+    no_edit=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 ;;
+  -c=*|--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" : '-[^=]*=\(.*\)'`
+    shift ;;
+  -c|--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"
+    shift ;;
+  -C=*|--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 ;;
+  -C|--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 ;;
+  -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
+    verify=
+    shift ;;
+  -v|--v|--ve|--ver|--veri|--verif|--verify)
+    verify=t
+    shift ;;
+  --)
+    shift
+    break ;;
+  -*)
+     usage ;;
+  *)
+    break ;;
+  esac
+done
+
+case "$log_given" in
+tt*)
+  die "Only one of -c/-C/-F/-m can be used." ;;
+esac
+
+case "$all,$#" in
+t,*)
+	git-diff-files --name-only -z |
+	xargs -0 git-update-cache -q --remove --
+	;;
+,0)
+	;;
+*)
+	git-diff-files --name-only -z "$@" |
+	xargs -0 git-update-cache -q --remove --
+	;;
+esac || exit 1
+git-update-cache -q --refresh || exit 1
+
+case "$verify" in
+t)
+	if test -x "$GIT_DIR"/hooks/pre-commit
+	then
+		"$GIT_DIR"/hooks/pre-commit || exit
+	fi
+esac
+
+PARENTS="-p HEAD"
+if [ ! -r "$GIT_DIR/HEAD" ]; then
+	if [ -z "$(git-ls-files)" ]; then
+		echo Nothing to commit 1>&2
+		exit 1
+	fi
+	{
+		echo "#"
+		echo "# Initial commit"
+		case "$no_edit" in
+		t) echo "# (ignoring your commit message for initial commit)"
+		   no_edit= 
+		esac
+		echo "#"
+		git-ls-files | sed 's/^/# New file: /'
+		echo "#"
+	} >.editmsg
+	PARENTS=""
+	no_edit=
+else
+	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
+		{
+		echo "#"
+		echo "# It looks like your may be committing a MERGE."
+		echo "# If this is not correct, please remove the file"
+		echo "#	$GIT_DIR/MERGE_HEAD"
+		echo "# and try again"
+		case "$no_edit" in
+		t) echo "# (ignoring your commit message for merge commit)"
+		   no_edit= 
+		esac
+		echo "#"
+		} |
+		git-stripspace >.editmsg
+		PARENTS="-p HEAD -p MERGE_HEAD"
+	elif test "$log_message" != ''
+	then
+		echo "$log_message" |
+		git-stripspace >.editmsg
+	elif test "$logfile" != ""
+	then
+		if test "$logfile" = -
+		then
+			test -t 0 &&
+			echo >&2 "(reading log message from standard input)"
+			cat
+		else
+			cat <"$logfile"
+		fi |
+		git-stripspace >.editmsg
+	elif test "$use_commit" != ""
+	then
+		pick_author_script='
+		/^author /{
+			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" |
+		sed -ne "$pick_author_script"`
+		eval "$set_author_env"
+		export GIT_AUTHOR_NAME
+		export GIT_AUTHOR_EMAIL
+		export GIT_AUTHOR_DATE
+		git-cat-file commit "$use_commit" |
+		sed -e '1,/^$/d' |
+		git-stripspace >.editmsg
+	fi
+
+	case "$signoff" in
+	t)
+		git-var GIT_COMMITTER_IDENT | sed -e '
+			s/>.*/>/
+			s/^/Signed-off-by: /' >>.editmsg ;;
+	esac
+	git-status-script >>.editmsg
+fi
+if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
 then
 	cat .editmsg
+	rm .editmsg
 	exit 1
 fi
-ED=${VISUAL:$EDITOR}
-ED=${ED:vi}
-$ED .editmsg
+case "$no_edit" in
+'')
+	${VISUAL:-${EDITOR:-vi}} .editmsg
+	;;
+esac
+
+case "$verify" in
+t)
+	if test -x "$GIT_DIR"/hooks/commit-msg
+	then
+		"$GIT_DIR"/hooks/commit-msg .editmsg || exit
+	fi
+esac
+
 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
-[ -s .cmitmsg ] || exit 1
-tree=$(git-write-tree) || exit 1
-commit=$(cat .cmitmsg | git-commit-tree $tree -p HEAD) || exit 1
-echo $commit > .git/HEAD
+grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk
+if test -s .cmitchk
+then
+	tree=$(git-write-tree) &&
+	commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
+	echo $commit > "$GIT_DIR/HEAD" &&
+	rm -f -- "$GIT_DIR/MERGE_HEAD"
+else
+	echo >&2 "* no commit message?  aborting commit."
+	false
+fi
+ret="$?"
+rm -f .cmitmsg .editmsg .cmitchk
+
+if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
+then
+	"$GIT_DIR"/hooks/post-commit
+fi
+exit "$ret"