admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'am/test-pathspec-f-f-error-cases'

Browse Source 
More tests.

* am/test-pathspec-f-f-error-cases:
  t: add tests for error conditions with --pathspec-from-file
This commit is contained in:
Junio C Hamano
2020-01-30 14:17:08 -08:00
parent d52adee779 f94f7bd00d
commit 96aef8f684
5 changed files with 105 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
t/t7526-commit-pathspec-file.sh
View File

@@ -134,10 +134,31 @@ test_expect_success 'only touches what was listed' '
verify_expect
'
test_expect_success '--pathspec-from-file and --all cannot be used together' '
test_expect_success 'error conditions' '
restore_checkpoint &&
test_must_fail git commit --pathspec-from-file=- --all -m "Commit" 2>err &&
test_i18ngrep "[-]-pathspec-from-file with -a does not make sense" err
echo fileA.t >list &&
>empty_list &&
test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
test_i18ngrep -e "--pathspec-from-file with -a does not make sense" err &&
test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
test_i18ngrep -e "No paths with --include/--only does not make sense." err &&
test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
test_i18ngrep -e "No paths with --include/--only does not make sense." err
'
test_done