X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-commit-script;h=57f5333db8517f4f250b563f694c067446c78c10;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=903c8dfabd9a15053e249ac2909036cab1d2922e;hpb=9c065315f70fb1086ef16fc37e72e3edbaf3e919;p=git.git

diff --git a/git-commit-script b/git-commit-script
index 903c8dfa..57f5333d 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -1,24 +1,49 @@
 #!/bin/sh
 : ${GIT_DIR=.git}
-PARENTS="HEAD"
-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"
-	echo "#"
-	PARENTS="HEAD -p MERGE_HEAD"
-fi > .editmsg
-git-status-script >> .editmsg
+if [ ! -d $GIT_DIR ]; then
+	echo Not a git directory 1>&2
+	exit 1
+fi
+git-update-cache -q --refresh -- "$@" || exit 1
+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"
+		echo "#"
+		git-ls-files | sed 's/^/# New file: /'
+		echo "#"
+	) > .editmsg
+	PARENTS=""
+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"
+		echo "#"
+		PARENTS="-p HEAD -p MERGE_HEAD"
+	fi > .editmsg
+	git-status-script >> .editmsg
+fi
 if [ "$?" != "0" ]
 then
 	cat .editmsg
+	rm .editmsg
 	exit 1
 fi
 ${VISUAL:-${EDITOR:-vi}} .editmsg
 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
-[ -s .cmitmsg ] || exit 1
-tree=$(git-write-tree) || exit 1
-commit=$(cat .cmitmsg | git-commit-tree $tree -p $PARENTS) || exit 1
-echo $commit > ${GIT_DIR:-.git}/HEAD
+[ -s .cmitmsg ] && 
+	tree=$(git-write-tree) &&
+	commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
+	echo $commit > $GIT_DIR/HEAD &&
+	rm -f -- $GIT_DIR/MERGE_HEAD
+ret="$?"
+rm -f .cmitmsg .editmsg
+exit "$ret"