mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
![Thomas Gummerer](/assets/img/avatar_default.png)
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>
48 lines
1.2 KiB
Bash
Executable file
48 lines
1.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='checkout --no-overlay <tree-ish> -- <pathspec>'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
git commit --allow-empty -m "initial"
|
|
'
|
|
|
|
test_expect_success 'checkout --no-overlay deletes files not in <tree-ish>' '
|
|
>file &&
|
|
mkdir dir &&
|
|
>dir/file1 &&
|
|
git add file dir/file1 &&
|
|
git checkout --no-overlay HEAD -- file &&
|
|
test_path_is_missing file &&
|
|
test_path_is_file dir/file1
|
|
'
|
|
|
|
test_expect_success 'checkout --no-overlay removing last file from directory' '
|
|
git checkout --no-overlay HEAD -- dir/file1 &&
|
|
test_path_is_missing dir
|
|
'
|
|
|
|
test_expect_success 'checkout -p --overlay is disallowed' '
|
|
test_must_fail git checkout -p --overlay HEAD 2>actual &&
|
|
test_i18ngrep "fatal: -p and --overlay are mutually exclusive" actual
|
|
'
|
|
|
|
test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
|
|
test_commit file1 file1 &&
|
|
test_commit file2 file2 &&
|
|
git rm --cached file1 &&
|
|
echo 1234 >file1 &&
|
|
F1=$(git rev-parse HEAD:file1) &&
|
|
F2=$(git rev-parse HEAD:file2) &&
|
|
{
|
|
echo "100644 $F1 1 file1" &&
|
|
echo "100644 $F2 2 file1"
|
|
} | git update-index --index-info &&
|
|
test_path_is_file file1 &&
|
|
git checkout --theirs --no-overlay -- file1 &&
|
|
test_path_is_missing file1
|
|
'
|
|
|
|
test_done
|