X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-status.sh;h=b90ffc198d97bccfc7f484e8555b01ba9bf5217b;hb=7b9b4c452c793d0f8e3ff9f0b7fe526448fc314a;hp=ca9a15459fc55c8a03aabf2bed85bc34817df450;hpb=8098a178b26dc7a158d129a092a5b78da6d12b72;p=git.git

diff --git a/git-status.sh b/git-status.sh
index ca9a1545..b90ffc19 100755
--- a/git-status.sh
+++ b/git-status.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2005 Linus Torvalds
 #
-. git-sh-setup || die "Not a git archive"
+GIT_DIR=$(git-rev-parse --git-dir) || exit
 
 report () {
   header="#
@@ -11,7 +11,7 @@ report () {
 #
 "
   trailer=""
-  while read oldmode mode oldsha sha status name newname
+  while read status name newname
   do
     echo -n "$header"
     header=""
@@ -37,12 +37,15 @@ refs/heads/master) ;;
 *)	echo "# On branch $branch" ;;
 esac
 
-git-update-index --refresh >/dev/null 2>&1
+git-update-index -q --unmerged --refresh || exit
 
 if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1
 then
-	git-diff-index -M --cached HEAD |
-	sed 's/^://' |
+	git-diff-index -M --cached --name-status --diff-filter=MDTCRA HEAD |
+	sed -e '
+		s/\\/\\\\/g
+		s/ /\\ /g
+	' |
 	report "Updated but not checked in" "will commit"
 
 	committable="$?"
@@ -51,31 +54,49 @@ else
 # Initial commit
 #'
 	git-ls-files |
-	sed 's/^/o o o o A /' |
+	sed -e '
+		s/\\/\\\\/g
+		s/ /\\ /g
+		s/^/A /
+	' |
 	report "Updated but not checked in" "will commit"
 
 	committable="$?"
 fi
 
-git-diff-files |
-sed 's/^://' |
+git-diff-files  --name-status |
+sed -e '
+	s/\\/\\\\/g
+	s/ /\\ /g
+' |
 report "Changed but not updated" "use git-update-index to mark for commit"
 
-if grep -v '^#' "$GIT_DIR/info/exclude" >/dev/null 2>&1
+
+if test -f "$GIT_DIR/info/exclude"
 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
+    git-ls-files -z --others \
+	--exclude-from="$GIT_DIR/info/exclude" \
+        --exclude-per-directory=.gitignore
+else
+    git-ls-files -z --others \
+        --exclude-per-directory=.gitignore
+fi |
+perl -e '$/ = "\0";
+	my $shown = 0;
+	while (<>) {
+		chomp;
+		s|\\|\\\\|g;
+		s|\t|\\t|g;
+		s|\n|\\n|g;
+		s/^/#	/;
+		if (!$shown) {
+			print "#\n# Untracked files:\n";
+			print "#   (use \"git add\" to add to commit)\n#\n";
+			$shown = 1;
+		}
+		print "$_\n";
+	}
+'
 
 case "$committable" in
 0)