Merge branch 'ns/rebase-auto-squash'

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

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 6d92196d24a5553b746618b8f5e24ef2ac36096d..83a8e14c6c385d6d6fbdd179d30018128e8a200f 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -88,7 +88,7 @@ test_expect_success 'used receive-pack service' '
        test_cmp exp act
 '
 
-test_expect_failure 'non-fast-forward push fails' '
+test_expect_success 'non-fast-forward push fails' '
        cd "$ROOT_PATH"/test_repo_clone &&
        git checkout master &&
        echo "changed" > path2 &&
@@ -104,14 +104,14 @@ 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' '
+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
 '
 
-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