2019-12-03 14:02:13 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='add --pathspec-from-file'
|
|
|
|
|
2021-10-30 22:24:20 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2019-12-03 14:02:13 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_tick
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
test_commit file0 &&
|
|
|
|
echo A >fileA.t &&
|
|
|
|
echo B >fileB.t &&
|
|
|
|
echo C >fileC.t &&
|
|
|
|
echo D >fileD.t
|
|
|
|
'
|
|
|
|
|
|
|
|
restore_checkpoint () {
|
|
|
|
git reset
|
|
|
|
}
|
|
|
|
|
|
|
|
verify_expect () {
|
|
|
|
git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success '--pathspec-from-file from stdin' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
|
|
|
echo fileA.t | git add --pathspec-from-file=- &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileA.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--pathspec-from-file from file' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
|
|
|
echo fileA.t >list &&
|
|
|
|
git add --pathspec-from-file=list &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileA.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'NUL delimiters' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
|
|
|
printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileA.t
|
|
|
|
A fileB.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'LF delimiters' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
|
|
|
printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileA.t
|
|
|
|
A fileB.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'no trailing delimiter' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
|
|
|
printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileA.t
|
|
|
|
A fileB.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'CRLF delimiters' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
|
|
|
printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileA.t
|
|
|
|
A fileB.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'quotes' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
2019-12-31 10:15:11 +00:00
|
|
|
cat >list <<-\EOF &&
|
|
|
|
"file\101.t"
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git add --pathspec-from-file=list &&
|
2019-12-03 14:02:13 +00:00
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileA.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
2019-12-31 10:15:11 +00:00
|
|
|
cat >list <<-\EOF &&
|
|
|
|
"file\101.t"
|
|
|
|
EOF
|
|
|
|
|
2019-12-03 14:02:13 +00:00
|
|
|
test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'only touches what was listed' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
|
|
|
|
printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
A fileB.t
|
|
|
|
A fileC.t
|
|
|
|
EOF
|
|
|
|
verify_expect
|
|
|
|
'
|
|
|
|
|
2019-12-30 15:38:38 +00:00
|
|
|
test_expect_success 'error conditions' '
|
|
|
|
restore_checkpoint &&
|
|
|
|
echo fileA.t >list &&
|
|
|
|
>empty_list &&
|
|
|
|
|
|
|
|
test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
|
2019-12-30 15:38:38 +00:00
|
|
|
|
|
|
|
test_must_fail git add --pathspec-from-file=list --patch 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
|
2019-12-30 15:38:38 +00:00
|
|
|
|
|
|
|
test_must_fail git add --pathspec-from-file=list --edit 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
|
2019-12-30 15:38:38 +00:00
|
|
|
|
|
|
|
test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
|
2019-12-30 15:38:38 +00:00
|
|
|
|
|
|
|
test_must_fail git add --pathspec-file-nul 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
|
2019-12-30 15:38:38 +00:00
|
|
|
|
|
|
|
# This case succeeds, but still prints to stderr
|
|
|
|
git add --pathspec-from-file=empty_list 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep -e "Nothing specified, nothing added." err
|
2019-12-30 15:38:38 +00:00
|
|
|
'
|
|
|
|
|
2019-12-03 14:02:13 +00:00
|
|
|
test_done
|