From a9aecc7abb52c4dcd616ee8f43ce5741a15e14a6 Mon Sep 17 00:00:00 2001 From: Alexandr Miloslavskiy Date: Tue, 3 Dec 2019 14:02:18 +0000 Subject: 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 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 `` arguments. Signed-off-by: Alexandr Miloslavskiy Signed-off-by: Junio C Hamano --- t/t9902-completion.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 't/t9902-completion.sh') 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 ' -- cgit v1.2.3