# [PATCH] git-sh-setup: Fail if the git directory was not found. 5 messages from 2006-08-11 to 2006-08-13. Participants: Robert Shearman, Alex Riesen, Junio C Hamano. Thread: https://gitlist.dev/t/5205 ## Robert Shearman, 2006-08-11 09:23 Subject: [PATCH] git-sh-setup: Fail if the git directory was not found. Message-ID: <44DC4C92.5060009@codeweavers.com> URL: https://gitlist.dev/e/44DC4C92.5060009%40codeweavers.com ``` Always use git-rev-parse to find a valid git directory, as git-repo-config no longer returns an error code if a git directory wasn't found. This fixes the message received when invoking certain commands implemented as shell scripts from outside of a git tree, so e.g. instead of receiving this: /home/rob/bin/git-fetch: line 89: /FETCH_HEAD: Permission denied We get this again: fatal: Not a git repository: '.git' Also, move the setting of GIT_OBJECT_DIRECTORY to outside of the non-subdir-ok case as it isn't specific to that case. Signed-off-by: Robert Shearman --- git-sh-setup.sh | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) Hopefully this patch addresses the concerns of Junio and others by continuing to allow git-ls-remotes to work outside of a git repository. diff --git a/git-sh-setup.sh b/git-sh-setup.sh index d15747f..49f9e3b 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -37,15 +37,9 @@ esac if [ -z "$SUBDIRECTORY_OK" ] then - : ${GIT_DIR=.git} - : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} - - # Make sure we are in a valid repository of a vintage we understand. - GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null - if test $? = 128 - then - exit - fi + GIT_DIR=$(GIT_DIR=.git git-rev-parse --git-dir) || exit else GIT_DIR=$(git-rev-parse --git-dir) || exit fi + +GIT_OBJECT_DIRECTORY="$GIT_DIR/objects" ``` ## Alex Riesen, 2006-08-11 19:42 Subject: Re: [PATCH] git-sh-setup: Fail if the git directory was not found. Message-ID: <20060811194226.GA12276@steel.home> URL: https://gitlist.dev/e/20060811194226.GA12276%40steel.home In-Reply-To: <44DC4C92.5060009@codeweavers.com> ``` Robert Shearman, Fri, Aug 11, 2006 11:23:30 +0200: > Always use git-rev-parse to find a valid git directory, as > git-repo-config no longer returns an error code if a git directory > wasn't found. BTW, did anyone notice that "--usage" almost always needs git directory? That is quite unusual. ``` ## Junio C Hamano, 2006-08-11 22:39 Subject: Re: [PATCH] git-sh-setup: Fail if the git directory was not found. Message-ID: <7vfyg2sxrk.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vfyg2sxrk.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <44DC4C92.5060009@codeweavers.com> ``` Robert Shearman writes: > Always use git-rev-parse to find a valid git directory, as > git-repo-config no longer returns an error code if a git directory > wasn't found. > > This fixes the message received when invoking certain commands > implemented as shell scripts from outside of a git tree, so > e.g. instead of receiving this: > /home/rob/bin/git-fetch: line 89: /FETCH_HEAD: Permission denied > We get this again: > fatal: Not a git repository: '.git' > > Also, move the setting of GIT_OBJECT_DIRECTORY to outside of the > non-subdir-ok case as it isn't specific to that case. > > Signed-off-by: Robert Shearman Moving the assignment of GIT_OBJECT_DIRECTORY is fine, but changing it to an unconditional assignment is wrong. The user can have a GIT_OBJECT_DIRECTORY set independently from GIT_DIR (or ../some/where/.git that is detected). The rest looks sane; the new test should still detect the case the original test tried to catch. > git-sh-setup.sh | 12 +++--------- > 1 files changed, 3 insertions(+), 9 deletions(-) > > Hopefully this patch addresses the concerns of Junio and others by > continuing to allow git-ls-remotes to work outside of a git repository. > diff --git a/git-sh-setup.sh b/git-sh-setup.sh > index d15747f..49f9e3b 100755 > --- a/git-sh-setup.sh > +++ b/git-sh-setup.sh > @@ -37,15 +37,9 @@ esac > > if [ -z "$SUBDIRECTORY_OK" ] > then > - : ${GIT_DIR=.git} > - : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} > - > - # Make sure we are in a valid repository of a vintage we understand. > - GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null > - if test $? = 128 > - then > - exit > - fi > + GIT_DIR=$(GIT_DIR=.git git-rev-parse --git-dir) || exit > else > GIT_DIR=$(git-rev-parse --git-dir) || exit > fi > + > +GIT_OBJECT_DIRECTORY="$GIT_DIR/objects" ``` ## Junio C Hamano, 2006-08-12 01:47 Subject: Re: [PATCH] git-sh-setup: Fail if the git directory was not found. Message-ID: <7vlkpuragp.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vlkpuragp.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <7vfyg2sxrk.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano writes: > Moving the assignment of GIT_OBJECT_DIRECTORY is fine, but > changing it to an unconditional assignment is wrong. The user > can have a GIT_OBJECT_DIRECTORY set independently from GIT_DIR > (or ../some/where/.git that is detected). How about this as a replacement? -- >8 -- [PATCH] git-sh-setup: do not use repo-config to test the git directory Since repo-config does not fail in non-git directory, it is not a good command to use to test the git-ness nor validate the repository revision of $GIT_DIR. Original patch by Robert Shearman but with minor fixes. Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index d15747f..42f9b1c 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -35,17 +35,12 @@ case "$1" in exit esac +# Make sure we are in a valid repository of a vintage we understand. if [ -z "$SUBDIRECTORY_OK" ] then : ${GIT_DIR=.git} - : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} - - # Make sure we are in a valid repository of a vintage we understand. - GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null - if test $? = 128 - then - exit - fi + GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || exit else GIT_DIR=$(git-rev-parse --git-dir) || exit fi +: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} -- 1.4.2.rc4.g9d8df ``` ## Robert Shearman, 2006-08-13 11:52 Subject: Re: [PATCH] git-sh-setup: Fail if the git directory was not found. Message-ID: <44DF1284.5080406@codeweavers.com> URL: https://gitlist.dev/e/44DF1284.5080406%40codeweavers.com In-Reply-To: <7vlkpuragp.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano wrote: >Junio C Hamano writes: > > > >>Moving the assignment of GIT_OBJECT_DIRECTORY is fine, but >>changing it to an unconditional assignment is wrong. The user >>can have a GIT_OBJECT_DIRECTORY set independently from GIT_DIR >>(or ../some/where/.git that is detected). >> >> I'm not an expert in shell scripting so I didn't notice that it was a conditional assignment. >How about this as a replacement? > > Looks good. Thanks, -- Rob Shearman ```