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

config: complain about --worktree outside of a git repo 

Running `git config --worktree` outside of a git repository hits a BUG()
when trying to enumerate the worktrees. Let's catch this error earlier
and die() with a friendlier message.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matheus Tavares 2020-09-09 10:16:08 -03:00 committed by Junio C Hamano
parent 47ae905ffb
commit 378fe5fc3d
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/config.c
View File

@ -628,11 +628,15 @@ int cmd_config(int argc, const char **argv, const char *prefix)
usage_builtin_config(); usage_builtin_config();
} }


if (use_local_config && nongit) if (nongit) {
die(_("--local can only be used inside a git repository")); if (use_local_config)
die(_("--local can only be used inside a git repository"));
if (given_config_source.blob)
die(_("--blob can only be used inside a git repository"));
if (use_worktree_config)
die(_("--worktree 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, "-")) {

13
t/t1300-config.sh
View File

@ -1836,11 +1836,14 @@ test_expect_success '--show-scope with --show-origin' '
test_cmp expect output test_cmp expect output
' '


test_expect_success '--local requires a repo' ' for opt in --local --worktree
# we expect 128 to ensure that we do not simply do
# fail to find anything and return code "1" test_expect_success "$opt requires a repo" '
test_expect_code 128 nongit git config --local foo.bar # 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 $opt foo.bar
'
done


cat >.git/config <<-\EOF && cat >.git/config <<-\EOF &&
[core] [core]