Junio C Hamano <gitster@xxxxxxxxx> writes: >> +test_expect_success 'restore -p without pathspec is fine' ' >> + echo q >cmd && >> + git restore -p <cmd >> +' > > This stands out as a sore thumb, being an invocation with '-p' while > all the other tests for the '-p' feature are in t2071. I'll have this inserted immediately after 09/11 in the meantime. I wonder if there is a clean way to make everything in 2071 with PERL prereq. I generally do not like the pattern used by some tests that manually check the prererq and have test_done early, though. Thanks. -- >8 -- From: Junio C Hamano <gitster@xxxxxxxxx> Date: Thu, 14 Mar 2019 14:48:47 +0900 Subject: [PATCH] SQUASH??? move -p test to 2071 from 2070 Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- t/t2070-restore.sh | 5 ----- t/t2071-restore-patch.sh | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh index df91bf54bc..3dc7032839 100755 --- a/t/t2070-restore.sh +++ b/t/t2070-restore.sh @@ -23,11 +23,6 @@ test_expect_success 'restore without pathspec is not ok' ' test_must_fail git restore --source=first ' -test_expect_success 'restore -p without pathspec is fine' ' - echo q >cmd && - git restore -p <cmd -' - test_expect_success 'restore a file, ignoring branch of same name' ' cat one >expected && echo dirty >>one && diff --git a/t/t2071-restore-patch.sh b/t/t2071-restore-patch.sh index 46ebcb2413..98b2476e7c 100755 --- a/t/t2071-restore-patch.sh +++ b/t/t2071-restore-patch.sh @@ -16,6 +16,11 @@ test_expect_success PERL 'setup' ' save_head ' +test_expect_success PERL 'restore -p without pathspec is fine' ' + echo q >cmd && + git restore -p <cmd +' + # note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar' test_expect_success PERL 'saying "n" does nothing' ' -- 2.21.0-155-ge902e9bcae
