mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
f94f7bd00d
Also move some old tests into the new tests: it doesn't seem reasonable to have individual error condition tests. Old test for `git commit` was corrected, previously it was instructed to use stdin but wasn't provided with any stdin. While this works at the moment, it's not exactly perfect. Old tests for `git reset` were improved to test for a specific error message. Suggested-By: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
153 lines
3.2 KiB
Bash
Executable file
153 lines
3.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='add --pathspec-from-file'
|
|
|
|
. ./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 &&
|
|
|
|
printf "\"file\\101.t\"" | git add --pathspec-from-file=- &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
A fileA.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
|
|
restore_checkpoint &&
|
|
|
|
printf "\"file\\101.t\"" >list &&
|
|
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
|
|
'
|
|
|
|
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 &&
|
|
test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
|
|
|
|
test_must_fail git add --pathspec-from-file=list --patch 2>err &&
|
|
test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
|
|
|
|
test_must_fail git add --pathspec-from-file=list --edit 2>err &&
|
|
test_i18ngrep -e "--pathspec-from-file is incompatible with --edit" err &&
|
|
|
|
test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
|
|
test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
|
|
|
|
test_must_fail git add --pathspec-file-nul 2>err &&
|
|
test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
|
|
|
|
# This case succeeds, but still prints to stderr
|
|
git add --pathspec-from-file=empty_list 2>err &&
|
|
test_i18ngrep -e "Nothing specified, nothing added." err
|
|
'
|
|
|
|
test_done
|