This series fixes some issues with parsing sparse-checkout patterns when core.sparseCheckoutCone is enabled but the sparse-checkout file itself contains patterns that don't match the cone mode format. The first patch fixes a segfault first reported in [1]. The other two patches are from an earlier submission [2] that never got picked up and I lost track of. There was another patch involving 'git sparse-checkout init --cone' that isn't necessary, especially with Elijah doing some work in that space right now. [1] https://github.com/git-for-windows/git/issues/3498 [2] https://lore.kernel.org/git/pull.1043.git.1632160658.gitgitgadget@xxxxxxxxx Thanks, -Stolee Derrick Stolee (4): sparse-checkout: fix segfault on malformed patterns sparse-checkout: fix OOM error with mixed patterns sparse-checkout: refuse to add to bad patterns amend! sparse-checkout: fix segfault on malformed patterns builtin/sparse-checkout.c | 5 ++++- dir.c | 5 +---- t/t1091-sparse-checkout-builtin.sh | 31 +++++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 6 deletions(-) base-commit: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1069%2Fderrickstolee%2Fsparse-checkout%2Finput-bug-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1069/derrickstolee/sparse-checkout/input-bug-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/1069 Range-diff vs v1: 1: becbee16d2e ! 1: a0e3dd335c9 sparse-checkout: fix segfault on malformed patterns @@ Commit message Add a test that triggers the segfault without the code change. Reported-by: John Burnett <johnburnett@xxxxxxxxxxxxxxx> + Reviewed-by: Elijah Newren <newren@xxxxxxxxx> Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> ## dir.c ## 2: 239bf23eacb ! 2: 86fbf130c03 sparse-checkout: fix OOM error with mixed patterns @@ Commit message Reported-by: Calbabreaker <calbabreaker@xxxxxxxxx> Helped-by: Taylor Blau <me@xxxxxxxxxxxx> + Reviewed-by: Elijah Newren <newren@xxxxxxxxx> Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> ## builtin/sparse-checkout.c ## 3: cc52fb2b0b7 ! 3: 5d096e380a4 sparse-checkout: refuse to add to bad patterns @@ Commit message 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@xxxxxxxxx> Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> ## builtin/sparse-checkout.c ## -: ----------- > 4: 7bacb3760f3 amend! sparse-checkout: fix segfault on malformed patterns -- gitgitgadget
