diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2021-12-16 16:13:42 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-12-30 14:39:57 -0800 |
| commit | a3eca5844526fd6111e7a1e8bdfa9813673a6f23 (patch) | |
| tree | 56d7b3765725d51da786f17b8a92dcce01a4db93 /builtin | |
| parent | sparse-checkout: fix OOM error with mixed patterns (diff) | |
| download | tgif-a3eca5844526fd6111e7a1e8bdfa9813673a6f23.tar.xz | |
sparse-checkout: refuse to add to bad patterns
When in cone mode sparse-checkout, it is unclear how 'git
sparse-checkout add <dir1> ...' should behave if the existing
sparse-checkout file does not match the cone mode patterns. Change the
behavior to fail with an error message about the existing patterns.
Also, all cone mode patterns start with a '/' character, so add that
restriction. This is necessary for our example test 'cone mode: warn on
bad pattern', but also requires modifying the example sparse-checkout
file we use to test the warnings related to recognizing cone mode
patterns.
This error checking would cause a failure further down the test script
because of a test that adds non-cone mode patterns without cleaning them
up. Perform that cleanup as part of the test now.
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/sparse-checkout.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index 9ccdcde983..6580075a63 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -598,6 +598,9 @@ static void add_patterns_cone_mode(int argc, const char **argv, die(_("unable to load existing sparse-checkout patterns")); free(sparse_filename); + if (!existing.use_cone_patterns) + die(_("existing sparse-checkout patterns do not use cone mode")); + hashmap_for_each_entry(&existing.recursive_hashmap, &iter, pe, ent) { if (!hashmap_contains_parent(&pl->recursive_hashmap, pe->pattern, &buffer) || |