mirror of
https://github.com/git/git
synced 2024-10-30 13:20:15 +00:00
bfda204ade
The pathspec given to git checkout and git restore is used with both tree_entry_interesting (via read_tree_recursive) and match_pathspec (via ce_path_match). The latter effectively only supports recursive matching regardless of the value of the pathspec flag "recursive", which is unset here. That causes different match results for pathspecs with wildcards, and can lead checkout and restore in no-overlay mode to remove entries instead of modifying them. Enable recursive matching for both checkout and restore to make matching consistent. Setting the flag in checkout_main() technically also affects git switch, but since that command doesn't accept pathspecs at all this has no actual consequence. Reported-by: Sergii Shkarnikov <sergii.shkarnikov@globallogic.com> Initial-test-by: Sergii Shkarnikov <sergii.shkarnikov@globallogic.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 lines
1.5 KiB
Bash
Executable file
59 lines
1.5 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_expect_success 'wildcard pathspec matches file in subdirectory' '
|
|
git reset --hard &&
|
|
mkdir subdir &&
|
|
test_commit file3-1 subdir/file3 &&
|
|
test_commit file3-2 subdir/file3 &&
|
|
|
|
git checkout --no-overlay file3-1 "*file3" &&
|
|
echo file3-1 >expect &&
|
|
test_path_is_file subdir/file3 &&
|
|
test_cmp expect subdir/file3
|
|
'
|
|
|
|
test_done
|