X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-status-script;h=ee8f7061ea3d327bb4a565f9aaa9cdc04c0fb772;hb=b893f09104ee5f1d8710dfe17cdf1cbac995f17a;hp=1999a66979ce5444b89c66a3ab7c13dcbf9b64ca;hpb=9804b7dc1974d59d4d37c37ba4624bb835456207;p=git.git

diff --git a/git-status-script b/git-status-script
index 1999a669..ee8f7061 100755
--- a/git-status-script
+++ b/git-status-script
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# Copyright (c) 2005 Linus Torvalds
+#
 . git-sh-setup-script || die "Not a git archive"
 
 report () {
@@ -33,13 +36,50 @@ case "$branch" in
 refs/heads/master) ;;
 *)	echo "# On branch $branch" ;;
 esac
+
 git-update-cache --refresh >/dev/null 2>&1
-git-diff-cache -M --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"
-committable="$?"
-git-diff-files | sed 's/^://' | report "Changed but not updated" "use git-update-cache to mark for commit"
-if [ "$committable" == "0" ]
+
+if test -f "$GIT_DIR/HEAD"
 then
+	git-diff-cache -M --cached HEAD |
+	sed 's/^://' |
+	report "Updated but not checked in" "will commit"
+
+	committable="$?"
+else
+	echo '#
+# Initial commit
+#'
+	git-ls-files |
+	sed 's/^/o o o o A /' |
+	report "Updated but not checked in" "will commit"
+
+	committable="$?"
+fi
+
+git-diff-files |
+sed 's/^://' |
+report "Changed but not updated" "use git-update-cache to mark for commit"
+
+if grep -v '^#' "$GIT_DIR/info/exclude" >/dev/null 2>&1
+then
+	git-ls-files --others \
+	    --exclude-from="$GIT_DIR/info/exclude" \
+	    --exclude-per-directory=.gitignore |
+	sed -e '
+	1i\
+#\
+# Ignored files:\
+#   (use "git add" to add to commit)\
+#
+	s/^/#	/
+	$a\
+#'
+fi
+
+case "$committable" in
+0)
 	echo "nothing to commit"
 	exit 1
-fi
+esac
 exit 0