From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 6 Aug 2005 17:04:50 +0000 (-0700)
Subject: [PATCH] Make git-sh-setup-script do what it was supposed to do
X-Git-Tag: v0.99.4~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4ad5f0979bf4791a0c4a755a3dd184c8f178550;p=git.git

[PATCH] Make git-sh-setup-script do what it was supposed to do

Duh. A missing && meant that half the tests that git-sh-setup-script were
_meant_ to do were actually totally ignored.

In particular, the git sanity checking ended up only testing that the
GIT_OBJECT_DIRECTORY was sane, not that GIT_DIR itself was..

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-sh-setup-script b/git-sh-setup-script
index 660c524ce..5bf471f78 100755
--- a/git-sh-setup-script
+++ b/git-sh-setup-script
@@ -12,6 +12,6 @@ die() {
 }
 
 [ -d "$GIT_DIR" ] &&
-[ -d "$GIT_DIR/refs" ]
+[ -d "$GIT_DIR/refs" ] &&
 [ -d "$GIT_OBJECT_DIRECTORY" ] &&
 [ -d "$GIT_OBJECT_DIRECTORY/00" ]