mirror of
https://github.com/git/git.git
synced 2024-05-24 15:26:10 +02:00
b338e9f668
ls-files --ignored can be used together with either --others or --cached. After being perplexed for a bit and digging in to the code, I assumed that ls-files -i was just broken and not printing anything and I had a nice patch ready to submit when I finally realized that -i can be used with --cached to find tracked ignores. While that was a mistake on my part, and a careful reading of the documentation could have made this more clear, I suspect this is an error others are likely to make as well. In fact, of two uses in our testsuite, I believe one of the two did make this error. In t1306.13, there are NO tracked files, and all the excludes built up and used in that test and in previous tests thus have to be about untracked files. However, since they were looking for an empty result, the mistake went unnoticed as their erroneous command also just happened to give an empty answer. -i will most the time be used with -o, which would suggest we could just make -i imply -o in the absence of either a -o or -c, but that would be a backward incompatible break. Instead, let's just flag -i without either a -o or -c as an error, and update the two relevant testcases to specify their intent. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
41 lines
836 B
Bash
Executable File
41 lines
836 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='ls-files --exclude does not affect index files'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'create repo with file' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m file &&
|
|
echo modification >file
|
|
'
|
|
|
|
check_output() {
|
|
test_expect_success "ls-files output contains file ($1)" "
|
|
echo '$2' >expect &&
|
|
git ls-files --exclude-standard --$1 >output &&
|
|
test_cmp expect output
|
|
"
|
|
}
|
|
|
|
check_all_output() {
|
|
check_output 'cached' 'file'
|
|
check_output 'modified' 'file'
|
|
}
|
|
|
|
check_all_output
|
|
test_expect_success 'add file to gitignore' '
|
|
echo file >.gitignore
|
|
'
|
|
check_all_output
|
|
|
|
test_expect_success 'ls-files -i -c lists only tracked-but-ignored files' '
|
|
echo content >other-file &&
|
|
git add other-file &&
|
|
echo file >expect &&
|
|
git ls-files -i -c --exclude-standard >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_done
|