kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config: die when --blob is used outside a repository 

If you run "config --blob" outside of a repository, then we
eventually try to resolve the blob name and hit a BUG().
Let's catch this earlier and provide a useful message.

Note that we could also catch this much lower in the stack,
in git_config_from_blob_ref(). That might cover other
callsites, too, but it's unclear whether those ones would
actually be bugs or not. So let's leave the low-level
functions to assume the caller knows what it's doing (and
BUG() if it turns out it doesn't).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2018-05-18 15:27:04 -07:00 committed by Junio C Hamano
parent 468165c1d8
commit 17b8a2d6cd
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/config.c
View File

@ -513,6 +513,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
if (use_local_config && nongit) if (use_local_config && nongit)
die(_("--local can only be used inside a git repository")); die(_("--local can only be used inside a git repository"));


if (given_config_source.blob && nongit)
die(_("--blob can only be used inside a git repository"));

if (given_config_source.file && if (given_config_source.file &&
!strcmp(given_config_source.file, "-")) { !strcmp(given_config_source.file, "-")) {
given_config_source.file = NULL; given_config_source.file = NULL;

4
t/t1307-config-blob.sh
View File

@ -73,4 +73,8 @@ test_expect_success 'can parse blob ending with CR' '
test_cmp expect actual test_cmp expect actual
' '


test_expect_success 'config --blob outside of a repository is an error' '
test_must_fail nongit git config --blob=foo --list
'

test_done test_done