diff options
| author |  Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> | 2019-12-03 14:02:18 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-12-04 10:10:37 -0800 |
| commit | a9aecc7abb52c4dcd616ee8f43ce5741a15e14a6 (patch) | |
| tree | 44d813a9785437d2b3d6b22c3e81723658b97f93 /t/t9902-completion.sh | |
| parent | doc: restore: synchronize <pathspec> description (diff) | |
| download | tgif-a9aecc7abb52c4dcd616ee8f43ce5741a15e14a6.tar.xz | |
checkout, restore: support the --pathspec-from-file option
Decisions taken for simplicity:
1) For now, `--pathspec-from-file` is declared incompatible with
`--patch`, even when <file> is not `stdin`. Such use case it not
really expected.
2) It is not allowed to pass pathspec in both args and file.
`you must specify path(s) to restore` block was moved down to be able to
test for `pathspec.nr` instead, because testing for `argc` is no longer
correct.
`git switch` does not support the new options because it doesn't expect
`<pathspec>` arguments.
Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9902-completion.sh')
| -rwxr-xr-x | t/t9902-completion.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 54f8ce18cb..0ed57006ce 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1438,6 +1438,8 @@ test_expect_success 'double dash "git checkout"' ' --no-guess Z --no-... Z --overlay Z + --pathspec-file-nul Z + --pathspec-from-file=Z EOF ' |