Merge branch 'gs/commit-graph-path-filter'

[thirdparty/git.git] / t / t5548-push-porcelain.sh

diff --git a/t/t5548-push-porcelain.sh b/t/t5548-push-porcelain.sh
index 96ba449a383d49c188d7e14129c33b147b0c7c6b..1b19b3ef559a3a0b74c421ab5de1b8da182d113a 100755 (executable)
--- a/t/t5548-push-porcelain.sh
+++ b/t/t5548-push-porcelain.sh
@@ -150,10 +150,10 @@ run_git_push_porcelain_output_test() {
                make_user_friendly_and_stable_output <out >actual &&
                cat >expect <<-EOF &&
                To <URL/of/upstream.git>
+               =    refs/heads/next:refs/heads/next    [up to date]
                !    refs/heads/bar:refs/heads/bar    [rejected] (non-fast-forward)
                !    (delete):refs/heads/baz    [rejected] (atomic push failed)
                !    refs/heads/master:refs/heads/master    [rejected] (atomic push failed)
-               !    refs/heads/next:refs/heads/next    [rejected] (atomic push failed)
                Done
                EOF
                test_cmp expect actual &&
@@ -168,7 +168,6 @@ run_git_push_porcelain_output_test() {
                EOF
                test_cmp expect actual
        '
-
        test_expect_success "prepare pre-receive hook ($PROTOCOL)" '
                write_script "$upstream/hooks/pre-receive" <<-EOF
                exit 1