mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
8a98758a8d
Decisions taken for simplicity: 1) For now, `--pathspec-from-file` is declared incompatible with `--patch`, even when <file> is not `-`. Such use case is not really expected. 2) It is not allowed to pass pathspec in both args and file. Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
100 lines
2.1 KiB
Bash
Executable file
100 lines
2.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='stash --pathspec-from-file'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_tick
|
|
|
|
test_expect_success setup '
|
|
>fileA.t &&
|
|
>fileB.t &&
|
|
>fileC.t &&
|
|
>fileD.t &&
|
|
git add fileA.t fileB.t fileC.t fileD.t &&
|
|
git commit -m "Files" &&
|
|
|
|
git tag checkpoint
|
|
'
|
|
|
|
restore_checkpoint () {
|
|
git reset --hard checkpoint
|
|
}
|
|
|
|
verify_expect () {
|
|
git stash show --name-status >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'simplest' '
|
|
restore_checkpoint &&
|
|
|
|
# More files are written to make sure that git didnt ignore
|
|
# --pathspec-from-file, stashing everything
|
|
echo A >fileA.t &&
|
|
echo B >fileB.t &&
|
|
echo C >fileC.t &&
|
|
echo D >fileD.t &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
EOF
|
|
|
|
echo fileA.t | git stash push --pathspec-from-file=- &&
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success '--pathspec-file-nul' '
|
|
restore_checkpoint &&
|
|
|
|
# More files are written to make sure that git didnt ignore
|
|
# --pathspec-from-file, stashing everything
|
|
echo A >fileA.t &&
|
|
echo B >fileB.t &&
|
|
echo C >fileC.t &&
|
|
echo D >fileD.t &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
M fileB.t
|
|
EOF
|
|
|
|
printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul &&
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'only touches what was listed' '
|
|
restore_checkpoint &&
|
|
|
|
# More files are written to make sure that git didnt ignore
|
|
# --pathspec-from-file, stashing everything
|
|
echo A >fileA.t &&
|
|
echo B >fileB.t &&
|
|
echo C >fileC.t &&
|
|
echo D >fileD.t &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileB.t
|
|
M fileC.t
|
|
EOF
|
|
|
|
printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- &&
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'error conditions' '
|
|
restore_checkpoint &&
|
|
echo A >fileA.t &&
|
|
echo fileA.t >list &&
|
|
|
|
test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&
|
|
test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
|
|
|
|
test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&
|
|
test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
|
|
|
|
test_must_fail git stash push --pathspec-file-nul 2>err &&
|
|
test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
|
|
'
|
|
|
|
test_done
|