summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@osdl.org>2005-08-06 10:04:50 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-06 10:19:17 -0700
commite4ad5f0979bf4791a0c4a755a3dd184c8f178550 (patch)
tree5ab2d5f10526993868e6f31103f94add7beeed6e
parentMerge with gitk. (diff)
downloadtgif-e4ad5f0979bf4791a0c4a755a3dd184c8f178550.tar.xz
[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>
-rwxr-xr-xgit-sh-setup-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-setup-script b/git-sh-setup-script
index 660c524ce8..5bf471f781 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" ]