From: Jeff King <peff@peff.net>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Josh Hagins <hagins.josh@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 2/3] setup_git_env: convert die("BUG") to BUG()
Date: Fri, 12 May 2017 23:29:18 -0400 [thread overview]
Message-ID: <20170513032918.cisxuwoi6lvswetg@sigill.intra.peff.net> (raw)
In-Reply-To: <20170513032414.mfrwabt4hovujde2@sigill.intra.peff.net>
Converting to BUG() makes it easier to detect and debug
cases where we hit this assertion. Coupled with a new test
in t1300, this shows that the test suite can detect such
corner cases.
Signed-off-by: Jeff King <peff@peff.net>
---
environment.c | 2 +-
t/t1300-repo-config.sh | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/environment.c b/environment.c
index ff6e4f06e..1f0bda5af 100644
--- a/environment.c
+++ b/environment.c
@@ -169,7 +169,7 @@ static void setup_git_env(void)
git_dir = getenv(GIT_DIR_ENVIRONMENT);
if (!git_dir) {
if (!startup_info->have_repository)
- die("BUG: setup_git_env called without repository");
+ BUG("setup_git_env called without repository");
git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
}
gitfile = read_gitfile(git_dir);
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index afcca0d52..867704a64 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1539,4 +1539,10 @@ test_expect_success !MINGW '--show-origin blob ref' '
test_cmp expect output
'
+test_expect_failure '--local requires a repo' '
+ # we expect 128 to ensure that we do not simply
+ # fail to find anything and return code "1"
+ test_expect_code 128 nongit git config --local foo.bar
+'
+
test_done
--
2.13.0.452.g0afc8e12b
next prev parent reply other threads:[~2017-05-13 3:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-12 14:19 [Git 2.13.0] BUG: setup_git_env called without repository Josh Hagins
2017-05-12 14:48 ` Johannes Schindelin
2017-05-15 0:22 ` Josh Hagins
2017-05-12 20:34 ` [PATCH] config: complain about --local outside of a git repo Jeff King
2017-05-12 22:31 ` Ævar Arnfjörð Bjarmason
2017-05-13 2:03 ` Jeff King
2017-05-13 3:24 ` [PATCH 0/3] BUG() and "config --local" outside of repo Jeff King
2017-05-13 3:28 ` [PATCH 1/3] usage.c: add BUG() function Jeff King
2017-05-13 3:55 ` Jeff King
2017-05-15 2:28 ` Junio C Hamano
2017-05-13 3:29 ` Jeff King [this message]
2017-05-13 3:29 ` [PATCH 3/3] config: complain about --local outside of a git repo Jeff King
2018-05-02 9:38 ` [PATCH v2 0/4] Finish the conversion from die("BUG: ...") to BUG() Johannes Schindelin
2018-05-02 9:38 ` [PATCH v2 1/4] test-tool: help verifying BUG() code paths Johannes Schindelin
2018-05-02 15:18 ` Duy Nguyen
2018-05-05 19:30 ` Johannes Schindelin
2018-05-02 9:38 ` [PATCH v2 2/4] run-command: use BUG() to report bugs, not die() Johannes Schindelin
2018-05-07 9:08 ` Jeff King
2018-05-02 9:38 ` [PATCH v2 3/4] Replace all die("BUG: ...") calls by BUG() ones Johannes Schindelin
2018-05-02 9:38 ` [PATCH v2 4/4] Convert remaining die*(BUG) messages Johannes Schindelin
2018-05-07 9:01 ` [PATCH v2 0/4] Finish the conversion from die("BUG: ...") to BUG() Jeff King
2017-05-13 0:04 ` [PATCH] config: complain about --local outside of a git repo Jonathan Nieder
2017-05-13 2:04 ` Jeff King
2017-05-15 0:31 ` Josh Hagins
2017-05-15 3:18 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170513032918.cisxuwoi6lvswetg@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=hagins.josh@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).