diff options
Diffstat (limited to 't/t5411/test-0001-standard-git-push--porcelain.sh')
| -rw-r--r-- | t/t5411/test-0001-standard-git-push--porcelain.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5411/test-0001-standard-git-push--porcelain.sh b/t/t5411/test-0001-standard-git-push--porcelain.sh index 2078d0a027..373ec3d865 100644 --- a/t/t5411/test-0001-standard-git-push--porcelain.sh +++ b/t/t5411/test-0001-standard-git-push--porcelain.sh @@ -15,7 +15,7 @@ test_expect_success "git-push ($PROTOCOL/porcelain)" ' > remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main Z > remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next Z > To <URL/of/upstream.git> - > <COMMIT-B>:refs/heads/main <OID-A>..<OID-B> + > <COMMIT-B>:refs/heads/main <COMMIT-A>..<COMMIT-B> > * HEAD:refs/heads/next [new branch] > Done EOF @@ -71,7 +71,7 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' > remote: # post-receive hook Z > remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next Z > To <URL/of/upstream.git> - > <COMMIT-B>:refs/heads/next <OID-A>..<OID-B> + > <COMMIT-B>:refs/heads/next <COMMIT-A>..<COMMIT-B> > ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward) > Done EOF @@ -109,7 +109,7 @@ test_expect_success "git-push -f ($PROTOCOL/porcelain)" ' > remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic Z > remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c Z > To <URL/of/upstream.git> - > + refs/heads/main:refs/heads/main <OID-B>...<OID-A> (forced update) + > + refs/heads/main:refs/heads/main <COMMIT-B>...<COMMIT-A> (forced update) > - :refs/heads/next [deleted] > * refs/tags/v123:refs/tags/v123 [new tag] > * refs/heads/main:refs/review/main/topic [new reference] |