| Message ID | 3dfd33eda3f9cbd0d87ba7bb31f4501aa7b8b8a8.1599657308.git.matheus.bernardino@usp.br (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 378fe5fc3d5e415b2d7062e29bc99029dc3418d5 |
| Headers | show |
| Series | config: complain about --worktree outside of a git repo | expand |
Matheus Tavares <matheus.bernardino@usp.br> writes: > 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> > --- > builtin/config.c | 12 ++++++++---- > t/t1300-config.sh | 13 ++++++++----- > 2 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/builtin/config.c b/builtin/config.c > index 5e39f61885..53e411d68a 100644 > --- a/builtin/config.c > +++ b/builtin/config.c > @@ -628,11 +628,15 @@ int cmd_config(int argc, const char **argv, const char *prefix) > usage_builtin_config(); > } > > - if (use_local_config && nongit) > - die(_("--local can only be used inside a git repository")); > + if (nongit) { > + 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")); > + } OK. The updated structure makes it more obvious that we handle three special cases. Good jobs. Thanks. > > if (given_config_source.file && > !strcmp(given_config_source.file, "-")) { > diff --git a/t/t1300-config.sh b/t/t1300-config.sh > index 97ebfe1f9d..825d9a184f 100755 > --- a/t/t1300-config.sh > +++ b/t/t1300-config.sh > @@ -1836,11 +1836,14 @@ test_expect_success '--show-scope with --show-origin' ' > test_cmp expect output > ' > > -test_expect_success '--local requires a repo' ' > - # 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 --local foo.bar > -' > +for opt in --local --worktree > +do > + test_expect_success "$opt requires a repo" ' > + # 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 && > [core]
diff --git a/builtin/config.c b/builtin/config.c index 5e39f61885..53e411d68a 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -628,11 +628,15 @@ int cmd_config(int argc, const char **argv, const char *prefix) usage_builtin_config(); } - if (use_local_config && nongit) - die(_("--local can only be used inside a git repository")); + if (nongit) { + 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 && !strcmp(given_config_source.file, "-")) { diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 97ebfe1f9d..825d9a184f 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -1836,11 +1836,14 @@ test_expect_success '--show-scope with --show-origin' ' test_cmp expect output ' -test_expect_success '--local requires a repo' ' - # 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 --local foo.bar -' +for opt in --local --worktree +do + test_expect_success "$opt requires a repo" ' + # 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 && [core]
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> --- builtin/config.c | 12 ++++++++---- t/t1300-config.sh | 13 ++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-)