diff options
| author |  Thomas Gummerer <t.gummerer@gmail.com> | 2019-02-04 21:13:16 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-02-04 13:30:14 -0800 |
| commit | e92aa0e4ef5a91781530449f9466a45c16c91f7f (patch) | |
| tree | f72dbe0c834e26a998196a749795ea7b70df53d9 /t | |
| parent | checkout: introduce checkout.overlayMode config (diff) | |
| download | tgif-e92aa0e4ef5a91781530449f9466a45c16c91f7f.tar.xz | |
revert "checkout: introduce checkout.overlayMode config"
This reverts 1495ff7da5 ("checkout: introduce checkout.overlayMode
config", 2019-01-08) and thus removes the checkout.overlayMode config
option.
The option was originally introduced to give users the option to make
the new no-overlay behaviour the default. However users may be using
'git checkout' in scripts, even though it is porcelain. Users setting
the option to false may actually end up accidentally breaking scripts.
With the introduction of a new subcommand that will make the behaviour
the default, the config option will not be needed anymore anyway.
Revert the commit and remove the config option, so we don't risk
breaking scripts.
Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2025-checkout-no-overlay.sh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh index a4912e35cb..76330cb5ab 100755 --- a/t/t2025-checkout-no-overlay.sh +++ b/t/t2025-checkout-no-overlay.sh @@ -44,14 +44,4 @@ test_expect_success '--no-overlay --theirs with D/F conflict deletes file' ' test_path_is_missing file1 ' -test_expect_success 'checkout with checkout.overlayMode=false deletes files not in <tree-ish>' ' - >file && - mkdir dir && - >dir/file1 && - git add file dir/file1 && - git -c checkout.overlayMode=false checkout HEAD -- file && - test_path_is_missing file && - test_path_is_file dir/file1 -' - test_done |