diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2019-11-21 22:04:49 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-11-22 16:11:45 +0900 |
| commit | f75a69f88099689b510c7a7261d637bc7004a749 (patch) | |
| tree | d20508b2db73514b1a130a305920270a3a03e049 | |
| parent | sparse-checkout: write using lockfile (diff) | |
| download | tgif-f75a69f88099689b510c7a7261d637bc7004a749.tar.xz | |
sparse-checkout: cone mode should not interact with .gitignore
During the development of the sparse-checkout "cone mode" feature,
an incorrect placement of the initializer for "use_cone_patterns = 1"
caused warnings to show up when a .gitignore file was present with
non-cone-mode patterns. This was fixed in the original commit
introducing the cone mode, but now we should add a test to avoid
hitting this problem again in the future.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t1091-sparse-checkout-builtin.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index f074b7f3be..e61ddb4ad5 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -284,4 +284,11 @@ test_expect_success 'fail when lock is taken' ' test_i18ngrep "File exists" err ' +test_expect_success '.gitignore should not warn about cone mode' ' + git -C repo config --worktree core.sparseCheckoutCone true && + echo "**/bin/*" >repo/.gitignore && + git -C repo reset --hard 2>err && + test_i18ngrep ! "disabling cone patterns" err +' + test_done |