diff options
Diffstat (limited to 't/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh')
| -rw-r--r-- | t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh index 1dc8551bc6..77b5b22ed4 100644 --- a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh +++ b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh @@ -45,7 +45,9 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1 remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1 To <URL/of/upstream.git> - * HEAD:refs/for/master/topic [new reference] + HEAD:refs/for/master/topic <OID-A>..<OID-B> + * HEAD:refs/changes/24/124/1 [new reference] + HEAD:refs/changes/25/125/1 <OID-A>..<OID-B> Done EOF test_cmp expect actual && @@ -106,7 +108,9 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1 To <URL/of/upstream.git> - * HEAD:refs/for/master/topic [new reference] + * HEAD:refs/changes/24/124/1 [new reference] + HEAD:refs/for/master/topic <OID-A>..<OID-B> + + HEAD:refs/changes/25/125/1 <OID-B>...<OID-A> (forced update) Done EOF test_cmp expect actual && @@ -154,7 +158,8 @@ test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porc remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1 remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2 To <URL/of/upstream.git> - * HEAD:refs/for/master/topic [new reference] + * HEAD:refs/changes/23/123/1 [new reference] + HEAD:refs/changes/24/124/2 <OID-A>..<OID-B> Done EOF test_cmp expect actual && |