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

peff · gitster · commit 17b8a2d6cdfc · 2018-05-21T09:47:13.000+09:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/config.c b/builtin/config.c
@@ -513,6 +513,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 	if (use_local_config && nongit)
 		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 &&
 			!strcmp(given_config_source.file, "-")) {
 		given_config_source.file = NULL;
diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
@@ -73,4 +73,8 @@ test_expect_success 'can parse blob ending with CR' '
 	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

Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,8 @@ test_expect_success 'can parse blob ending with CR' '`
`73`	`73`	`test_cmp expect actual`
`74`	`74`	`'`
`75`	`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`	`+`
`76`	`80`	`test_done`