X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-status.sh;h=6e2783a7b4df7ec77aa4d472e84db323f65ecc83;hb=cc1621e2a02ed2a408571ed6f6ba84de2166e334;hp=44398d760c4b212bfebbbe09c4bb11d2068ad49d;hpb=5d1a5c02e8ac1c16688ea4a44512245f25a49f8a;p=git.git

diff --git a/git-status.sh b/git-status.sh
index 44398d76..6e2783a7 100755
--- a/git-status.sh
+++ b/git-status.sh
@@ -42,7 +42,15 @@ 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/^://' |
+	sed -e '
+		s/^:// 
+		h
+		s/^[^\t]*//
+		s/ /\\ /g
+		x
+		s/\t.*$//
+		G
+		s/\n/ /' |
 	report "Updated but not checked in" "will commit"
 
 	committable="$?"
@@ -51,14 +59,24 @@ else
 # Initial commit
 #'
 	git-ls-files |
-	sed 's/^/o o o o A /' |
+	sed -e '
+		s/ /\\ /g
+		s/^/o o o o A /' |
 	report "Updated but not checked in" "will commit"
 
 	committable="$?"
 fi
 
 git-diff-files |
-sed 's/^://' |
+sed -e '
+	s/^:// 
+	h
+	s/^[^\t]*//
+	s/ /\\ /g
+	x
+	s/\t.*$//
+	G
+	s/\n/ /' |
 report "Changed but not updated" "use git-update-index to mark for commit"
 
 if grep -v '^#' "$GIT_DIR/info/exclude" >/dev/null 2>&1