From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Charles Bailey <charles@hashpling.org>
Subject: [PATCH v3 1/3] git-sh-setup: move GIT_DIR initialization into a function
Date: Sat, 11 Oct 2014 01:39:36 -0700 [thread overview]
Message-ID: <1413016778-94829-1-git-send-email-davvid@gmail.com> (raw)
Signed-off-by: David Aguilar <davvid@gmail.com>
---
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
next reply other threads:[~2014-10-11 8:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-11 8:39 David Aguilar [this message]
2014-10-11 8:39 ` [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help David Aguilar
2014-10-11 8:39 ` [PATCH v3 3/3] difftool: don't assume that default sh is sane David Aguilar
2014-10-13 19:16 ` [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help Junio C Hamano
2014-10-15 6:35 ` David Aguilar
2014-10-15 6:48 ` David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413016778-94829-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).