X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-status.sh;h=44398d760c4b212bfebbbe09c4bb11d2068ad49d;hb=ab1630a3ed31d6ec5ae83769c78ed542fe3c4a28;hp=621fa49d2bcad6c5343ac5c172fb9ca6a855c18d;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-status.sh b/git-status.sh
index 621fa49d..44398d76 100755
--- a/git-status.sh
+++ b/git-status.sh
@@ -31,15 +31,15 @@ report () {
   [ "$header" ]
 }
 
-branch=`readlink "$GIT_DIR/HEAD"`
+branch=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD)
 case "$branch" in
 refs/heads/master) ;;
 *)	echo "# On branch $branch" ;;
 esac
 
-git-update-index --refresh >/dev/null 2>&1
+git-update-index -q --unmerged --refresh || exit
 
-if test -f "$GIT_DIR/HEAD"
+if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1
 then
 	git-diff-index -M --cached HEAD |
 	sed 's/^://' |