Merge refs/heads/master from .

diff --git a/git-sh-setup-script b/git-sh-setup-script
old mode 100644 (file)
new mode 100755 (executable)
index 660c524..84e15df
--- a/git-sh-setup-script
+++ b/git-sh-setup-script
@@ -11,7 +11,6 @@ die() {
        exit 1
 }
 
-[ -d "$GIT_DIR" ] &&
-[ -d "$GIT_DIR/refs" ]
-[ -d "$GIT_OBJECT_DIRECTORY" ] &&
+[ -h "$GIT_DIR/HEAD" ] &&
+[ -d "$GIT_DIR/refs" ] &&
 [ -d "$GIT_OBJECT_DIRECTORY/00" ]