From: Junio C Hamano Date: Thu, 25 Jun 2026 03:36:18 GMT Subject: Re: [PATCH v2 2/2] push: suggest for a slash slip Message-ID: In-Reply-To: Junio C Hamano writes: > "Harald Nordgren via GitGitGadget" writes: > >> diff --git a/t/t5529-push-errors.sh b/t/t5529-push-errors.sh >> index 80b06a0cd2..cfb294305d 100755 >> --- a/t/t5529-push-errors.sh >> +++ b/t/t5529-push-errors.sh >> @@ -54,6 +54,37 @@ test_expect_success 'detect empty remote with targeted refspec' ' >> grep "fatal: bad repository ${SQ}${SQ}" stderr >> ' > t5529-push-errors.sh:59: error: bare grep outside pipeline (use test_grep) > t5529-push-errors.sh:60: error: bare grep outside pipeline (use test_grep) > t5529-push-errors.sh:62: error: bare grep outside pipeline (use test_grep) > t5529-push-errors.sh:67: error: bare grep outside pipeline (use test_grep) > t5529-push-errors.sh:72: error: bare grep outside pipeline (use test_grep) > t5529-push-errors.sh:77: error: bare grep outside pipeline (use test_grep) > t5529-push-errors.sh:84: error: bare grep outside pipeline (use test_grep) I've queued this squashable? fix on top of the branch before merging the result to 'seen' for tonight's push-out. Thanks. --- >8 --- Subject: [PATCH] SQUASH??? use test_grep --- t/t5529-push-errors.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/t/t5529-push-errors.sh b/t/t5529-push-errors.sh index cfb294305d..2294645902 100755 --- a/t/t5529-push-errors.sh +++ b/t/t5529-push-errors.sh @@ -56,32 +56,32 @@ test_expect_success 'detect empty remote with targeted refspec' ' test_expect_success 'suggest for a / slip' ' test_must_fail git push origin/main 2>stderr && - grep "${SQ}origin/main${SQ} is not a valid push target" stderr && - grep "hint: Did you mean to use: git push origin main?" stderr && + test_grep "${SQ}origin/main${SQ} is not a valid push target" stderr && + test_grep "hint: Did you mean to use: git push origin main?" stderr && test_must_fail git -c advice.pushRepoLooksLikeRef=false push origin/main 2>stderr && - ! grep "Did you mean" stderr + test_grep ! "Did you mean" stderr ' test_expect_success 'suggest when the branch has slashes' ' test_must_fail git push origin/feature/x 2>stderr && - grep "hint: Did you mean to use: git push origin feature/x?" stderr + test_grep "hint: Did you mean to use: git push origin feature/x?" stderr ' test_expect_success 'no suggestion when prefix is not a configured remote' ' test_must_fail git push not-a-remote/main 2>stderr && - ! grep "Did you mean" stderr + test_grep ! "Did you mean" stderr ' test_expect_success 'no suggestion for a trailing slash with no branch' ' test_must_fail git push origin/ 2>stderr && - ! grep "Did you mean" stderr + test_grep ! "Did you mean" stderr ' test_expect_success 'no suggestion when the argument is an existing path' ' test_when_finished "rm -rf origin" && git init --bare origin/main && git push origin/main HEAD:refs/heads/pushed 2>stderr && - ! grep "Did you mean" stderr && + test_grep ! "Did you mean" stderr && git -C origin/main rev-parse --verify refs/heads/pushed ' -- 2.55.0-rc2-165-g3249676ba5