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>
Jeff King committed
May 18, 2018 at 15:27 UTC
17b8a2d6cdfc359b1a7de6dd215dc3c32ab1dbfe
2 files changed
+7
builtin/config.c
+3
@@ -513,6 +513,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
513
if (use_local_config && nongit)
514
die(_("--local can only be used inside a git repository"));
515
516
+ if (given_config_source.blob && nongit)
517
+ die(_("--blob can only be used inside a git repository"));
518
+
519
if (given_config_source.file &&
520
!strcmp(given_config_source.file, "-")) {
521
given_config_source.file = NULL;
t/t1307-config-blob.sh
+4
@@ -73,4 +73,8 @@ test_expect_success 'can parse blob ending with CR' '
73
test_cmp expect actual
74
'
75
76
+test_expect_success 'config --blob outside of a repository is an error' '
77
+ test_must_fail nongit git config --blob=foo --list
78
+'
79
+
80
test_done