Use config file settings for http

[git.git] / git-status.sh

diff --git a/git-status.sh b/git-status.sh
index ca9a154..fbdd377 100755 (executable)
--- a/git-status.sh
+++ b/git-status.sh
@@ -37,12 +37,20 @@ 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/^://' |
+       sed -e '
+               s/^:// 
+               h
+               s/^[^   ]*//
+               s/ /\\ /g
+               x
+               s/      .*$//
+               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/^[^   ]*//
+       s/ /\\ /g
+       x
+       s/      .*$//
+       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