Revision 865406bc5426d5196935e37a3a5fde9c843c3e96 authored by Philip Oakley on 29 July 2019, 20:08:03 UTC, committed by Junio C Hamano on 29 July 2019, 21:51:42 UTC
Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC build, but it was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and will be handled elsewhere. Also only substitute filenames ending with .o when generating the source .c filename, otherwise we would start to expect .cbj files to generate .obj files (which are not generated by our build)... In the future there may be source files that produce .obj files so keep the two issues (.obj files with & without source files) separate. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Duncan Smart <duncan.smart@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 158471d
t7521-ignored-mode.sh
#!/bin/sh
test_description='git status ignored modes'
. ./test-lib.sh
test_expect_success 'setup initial commit and ignore file' '
cat >.gitignore <<-\EOF &&
*.ign
ignored_dir/
!*.unignore
EOF
git add . &&
git commit -m "Initial commit"
'
test_expect_success 'Verify behavior of status on directories with ignored files' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/ignored/ignored_1.ign
! dir/ignored/ignored_2.ign
! ignored/ignored_1.ign
! ignored/ignored_2.ign
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify status behavior on directory with tracked & ignored files' '
test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/tracked_ignored/ignored_1.ign
! dir/tracked_ignored/ignored_2.ign
! tracked_ignored/ignored_1.ign
! tracked_ignored/ignored_2.ign
EOF
mkdir -p tracked_ignored dir/tracked_ignored &&
touch tracked_ignored/tracked_1 tracked_ignored/tracked_2 \
tracked_ignored/ignored_1.ign tracked_ignored/ignored_2.ign \
dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 \
dir/tracked_ignored/ignored_1.ign dir/tracked_ignored/ignored_2.ign &&
git add tracked_ignored/tracked_1 tracked_ignored/tracked_2 \
dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 &&
git commit -m "commit tracked files" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify status behavior on directory with untracked and ignored files' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? dir/untracked_ignored/untracked_1
? dir/untracked_ignored/untracked_2
? expect
? output
? untracked_ignored/untracked_1
? untracked_ignored/untracked_2
! dir/untracked_ignored/ignored_1.ign
! dir/untracked_ignored/ignored_2.ign
! untracked_ignored/ignored_1.ign
! untracked_ignored/ignored_2.ign
EOF
mkdir -p untracked_ignored dir/untracked_ignored &&
touch untracked_ignored/untracked_1 untracked_ignored/untracked_2 \
untracked_ignored/ignored_1.ign untracked_ignored/ignored_2.ign \
dir/untracked_ignored/untracked_1 dir/untracked_ignored/untracked_2 \
dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify status matching ignored files on ignored directory' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! ignored_dir/
EOF
mkdir ignored_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
cat >expect <<-\EOF &&
? expect
? output
! ignored_dir/ignored_1
! ignored_dir/ignored_1.ign
! ignored_dir/ignored_2
! ignored_dir/ignored_2.ign
EOF
mkdir ignored_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \
ignored_dir/tracked &&
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
? untracked_dir/
! ignored_dir/
! ignored_files/ignored_1.ign
! ignored_files/ignored_2.ign
EOF
mkdir ignored_dir ignored_files untracked_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
? untracked_dir/
! ignored_dir/
! ignored_files/ignored_1.ign
! ignored_files/ignored_2.ign
EOF
mkdir ignored_dir ignored_files untracked_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
cat >expect <<-\EOF &&
? expect
? output
! ignored_dir/ignored_1
! ignored_dir/ignored_1.ign
! ignored_dir/ignored_2
! ignored_dir/ignored_2.ign
EOF
mkdir ignored_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \
ignored_dir/tracked &&
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=no' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=no --untracked-files=all >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/ignored/ignored_1.ign
! dir/ignored/ignored_2.ign
! ignored/ignored_1.ign
! ignored/ignored_2.ign
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=all >output &&
test_i18ncmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/
! ignored/
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output &&
test_i18ncmp expect output
'
test_done
Computing file changes ...
