From: Gabriel Filion <lelutin@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] require_work_tree broken with NONGIT_OK
Date: Sun, 14 Feb 2010 22:51:47 -0500 [thread overview]
Message-ID: <4B78C4D3.90407@gmail.com> (raw)
When sourcing git-sh-setup after having set NONGIT_OK, calling the
function require_work_tree while outside of a git repository shows a
syntax error.
This is caused by the call to "git rev-parse --is-inside-work-tree"
printing a sentence when it is called outside of a git repository.
Relying on the return code is better.
---
git-sh-setup.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d56426d..8de2f03 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -128,7 +128,7 @@ cd_to_toplevel () {
}
require_work_tree () {
- test $(git rev-parse --is-inside-work-tree) = true ||
+ test git rev-parse --is-inside-work-tree >/dev/null 2>&1 ||
die "fatal: $0 cannot be used without a working tree."
}
-- 1.6.6
next reply other threads:[~2010-02-15 3:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-15 3:51 Gabriel Filion [this message]
2010-02-15 5:34 ` [PATCH] require_work_tree broken with NONGIT_OK Jeff King
2010-02-15 6:38 ` Junio C Hamano
2010-02-15 7:24 ` Gabriel Filion
2010-02-15 7:49 ` Jeff King
2010-02-15 15:14 ` Gabriel Filion
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=4B78C4D3.90407@gmail.com \
--to=lelutin@gmail.com \
--cc=git@vger.kernel.org \
/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).