Re: [PATCH] t5541-http-push: make grep expression check for one line only
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:06
Tay Ray Chuan [off-list ref] writes:
Simplify the grep expressions in the non-fast-forward tests to check only for the first line of the non-fast-forward warning - having that line should be enough assurance that the full warning is printed. In the first place, grep can't deal with expressions for multiple lines.
This shows that nobody has ever run this test since January 8th, not even the original author? Hmmm. Thanks.
quoted hunk
Signed-off-by: Tay Ray Chuan <redacted> --- t/t5541-http-push.sh | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 83a8e14..53f54a2 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh@@ -105,10 +105,8 @@ test_expect_success 'non-fast-forward push show ref status' ' ' test_expect_success 'non-fast-forward push shows help message' ' - grep \ -"To prevent you from losing history, non-fast-forward updates were rejected -Merge the remote changes before pushing again. See the '"'non-fast-forward'"' -section of '"'git push --help'"' for details." output + grep "To prevent you from losing history, non-fast-forward updates were rejected" \ + output ' test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '@@ -126,10 +124,8 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output && grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output && - grep \ -"To prevent you from losing history, non-fast-forward updates were rejected -Merge the remote changes before pushing again. See the '"'non-fast-forward'"' -section of '"'git push --help'"' for details." output + grep "To prevent you from losing history, non-fast-forward updates were rejected" \ + output ' stop_httpd-- 1.6.6