Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / t / t5541-http-push.sh

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index cc740fe124a4d656b588dc0a881396b068b961f8..53f54a2789557bcfd4e9843b50fe28189fa6f356 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -100,18 +100,16 @@ test_expect_success 'non-fast-forward push fails' '
         test $HEAD != $(git rev-parse --verify HEAD))
 '
 
-test_expect_failure 'non-fast-forward push show ref status' '
+test_expect_success 'non-fast-forward push show ref status' '
        grep "^ ! \[rejected\][ ]*master -> master (non-fast-forward)$" output
 '
 
-test_expect_failure '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
+test_expect_success 'non-fast-forward push shows help message' '
+       grep "To prevent you from losing history, non-fast-forward updates were rejected" \
+               output
 '
 
-test_expect_failure 'push fails for non-fast-forward refs unmatched by remote helper' '
+test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
        # create a dissimilarly-named remote ref so that git is unable to match the
        # two refs (viz. local, remote) unless an explicit refspec is provided.
        git push origin master:retsam
@@ -126,10 +124,8 @@ test_expect_failure '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