diff --git a/git-commit.sh b/git-commit.sh
index 41538f1..5ea3fd0 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -379,8 +379,11 @@
 		then
 			refuse_partial "Cannot do a partial commit during a merge."
 		fi
+
 		TMP_INDEX="$GIT_DIR/tmp-index$$"
-		commit_only=`git ls-files --error-unmatch -- "$@"` || exit
+		W=
+		test -z "$initial_commit" && W=--with-tree=HEAD
+		commit_only=`git ls-files --error-unmatch $W -- "$@"` || exit
 
 		# Build a temporary index and update the real index
 		# the same way.