X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-commit-script;h=f88a51a43ce2a3660fa82c13e502df429678d168;hb=96069cf03aca672e93d862813f2e7f05c1c7ac72;hp=e818d0a35ce2a9f5358520b7c44dfe27845de4b7;hpb=ef6a46e6eaae5e70df8b7ef9d7ead66c3313027e;p=git.git

diff --git a/git-commit-script b/git-commit-script
index e818d0a3..f88a51a4 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -1,5 +1,35 @@
 #!/bin/sh
-git-status-script > .editmsg
+: ${GIT_DIR=.git}
+if [ ! -d $GIT_DIR ]; then
+	echo Not a git directory 1>&2
+	exit 1
+fi
+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
@@ -9,5 +39,6 @@ ${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 HEAD) || exit 1
-echo $commit > ${GIT_DIR:-.git}/HEAD
+commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) || exit 1
+echo $commit > $GIT_DIR/HEAD
+rm -f -- $GIT_DIR/MERGE_HEAD