From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 12:51:27 +0000 (+0900)
Subject: Merge branch 'jk/config-blob-sans-repo'
X-Git-Tag: v2.18.0-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b2fd6592943db80ef9bfccbf55d65a39268d76ed?hp=0821b73063a6d4cfd2f61619b7afe01ce9c6d99e

Merge branch 'jk/config-blob-sans-repo'

Error codepath fix.

* jk/config-blob-sans-repo:
config: die when --blob is used outside a repository
---

diff --git a/builtin/config.c b/builtin/config.c
index 1e31aa9f8d..b29d26dede 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -602,6 +602,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
index eed31ffa30..37dc689d8c 100755
--- 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