[PATCH v3 1/3] git-sh-setup: move GIT_DIR initialization into a function
From: David Aguilar <hidden>
Date: 2016-06-15 23:02:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: David Aguilar <redacted> --- This is a new patch since the last round, prep for 2/3 git-sh-setup.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 9447980..d968760 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh@@ -330,8 +330,7 @@ esac # Make sure we are in a valid repository of a vintage we understand, # if we require to be in a git repository. -if test -z "$NONGIT_OK" -then +git_dir_init () { GIT_DIR=$(git rev-parse --git-dir) || exit if [ -z "$SUBDIRECTORY_OK" ] then
@@ -346,6 +345,11 @@ then exit 1 } : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} +} + +if test -z "$NONGIT_OK" +then + git_dir_init fi peel_committish () {
--
2.1.2.378.g89c0b73