t5541-http-push: make grep expression check for one line only
Don't feed a multiple-line pattern to grep and expect the them to match with lines in order. 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. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan committed
Jan 25, 2010 at 15:42 UTC
9567f082ddc1f3143a153d0ecf59f3727ff0f7a5
1 file changed
+4
-8
t/t5541-http-push.sh
+4
-8
@@ -105,10 +105,8 @@ test_expect_success 'non-fast-forward push show ref status' '
105
'
106
107
test_expect_success 'non-fast-forward push shows help message' '
108
- grep \
109
-"To prevent you from losing history, non-fast-forward updates were rejected
110
-Merge the remote changes before pushing again. See the '"'non-fast-forward'"'
111
-section of '"'git push --help'"' for details." output
108
+ grep "To prevent you from losing history, non-fast-forward updates were rejected" \
109
+ output
110
'
111
112
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
124
grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
125
grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output &&
126
129
- grep \
130
-"To prevent you from losing history, non-fast-forward updates were rejected
131
-Merge the remote changes before pushing again. See the '"'non-fast-forward'"'
132
-section of '"'git push --help'"' for details." output
127
+ grep "To prevent you from losing history, non-fast-forward updates were rejected" \
128
+ output
129
'
130
131
stop_httpd