mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-sh-setup: move GIT_DIR initialization into a function

Browse Source 
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2014-10-11 01:39:36 -07:00
committed by Junio C Hamano
parent 9c66cd3bd0
commit 1c7e2d23e4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-sh-setup.sh
View File

@ -330,8 +330,7 @@ esac
# Make sure we are in a valid repository of a vintage we understand, # Make sure we are in a valid repository of a vintage we understand,
# if we require to be in a git repository. # if we require to be in a git repository.
if test -z "$NONGIT_OK" git_dir_init () {
then
GIT_DIR=$(git rev-parse --git-dir) || exit GIT_DIR=$(git rev-parse --git-dir) || exit
if [ -z "$SUBDIRECTORY_OK" ] if [ -z "$SUBDIRECTORY_OK" ]
then then
@ -346,6 +345,11 @@ then
exit 1 exit 1
} }
: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
}
if test -z "$NONGIT_OK"
then
git_dir_init
fi fi
peel_committish () { peel_committish () {