mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![Jiang Xin](/assets/img/avatar_default.png)
Add new function "get_abbrev_oid" to get abbrev object ID. This function has a default value which helps to prepare a nonempty replace pattern for sed command. An empty replace pattern may cause sed fail to allocate memory. Refactor function "make_user_friendly_and_stable_output" to use "get_abbrev_oid" to get abbrev object ID. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
135 lines
4.5 KiB
Bash
135 lines
4.5 KiB
Bash
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push : main(B) next(A)
|
|
test_expect_success "git-push ($PROTOCOL)" '
|
|
git -C workbench push origin \
|
|
$B:refs/heads/main \
|
|
HEAD:refs/heads/next \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next Z
|
|
> remote: # post-receive hook Z
|
|
> 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-A>..<COMMIT-B> <COMMIT-B> -> main
|
|
> * [new branch] HEAD -> next
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-B> refs/heads/main
|
|
<COMMIT-A> refs/heads/next
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(B) next(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push --atomic: main(A) next(B)
|
|
test_expect_success "git-push --atomic ($PROTOCOL)" '
|
|
test_must_fail git -C workbench push --atomic origin \
|
|
main \
|
|
$B:refs/heads/next \
|
|
>out-$test_count 2>&1 &&
|
|
filter_out_user_friendly_and_stable_output \
|
|
-e "/^To / { p; }" \
|
|
-e "/^ ! / { p; }" \
|
|
<out-$test_count >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> To <URL/of/upstream.git>
|
|
> ! [rejected] main -> main (non-fast-forward)
|
|
> ! [rejected] <COMMIT-B> -> next (atomic push failed)
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-B> refs/heads/main
|
|
<COMMIT-A> refs/heads/next
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(B) next(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push : main(A) next(B)
|
|
test_expect_success "non-fast-forward git-push ($PROTOCOL)" '
|
|
test_must_fail git \
|
|
-C workbench \
|
|
-c advice.pushUpdateRejected=false \
|
|
push origin \
|
|
main \
|
|
$B:refs/heads/next \
|
|
>out-$test_count 2>&1 &&
|
|
make_user_friendly_and_stable_output <out-$test_count >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next Z
|
|
> To <URL/of/upstream.git>
|
|
> <COMMIT-A>..<COMMIT-B> <COMMIT-B> -> next
|
|
> ! [rejected] main -> main (non-fast-forward)
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-B> refs/heads/main
|
|
<COMMIT-B> refs/heads/next
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(B) next(B)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push -f : main(A) NULL tags/v123 refs/review/main/topic(A) a/b/c(A)
|
|
test_expect_success "git-push -f ($PROTOCOL)" '
|
|
git -C workbench push -f origin \
|
|
refs/tags/v123 \
|
|
:refs/heads/next \
|
|
main \
|
|
main:refs/review/main/topic \
|
|
HEAD:refs/heads/a/b/c \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main Z
|
|
> remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next Z
|
|
> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main Z
|
|
> remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next Z
|
|
> remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 Z
|
|
> 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>
|
|
> + <COMMIT-B>...<COMMIT-A> main -> main (forced update)
|
|
> - [deleted] next
|
|
> * [new tag] v123 -> v123
|
|
> * [new reference] main -> refs/review/main/topic
|
|
> * [new branch] HEAD -> a/b/c
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-A> refs/heads/a/b/c
|
|
<COMMIT-A> refs/heads/main
|
|
<COMMIT-A> refs/review/main/topic
|
|
<TAG-v123> refs/tags/v123
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
test_expect_success "cleanup ($PROTOCOL)" '
|
|
(
|
|
cd "$upstream" &&
|
|
git update-ref -d refs/review/main/topic &&
|
|
git update-ref -d refs/tags/v123 &&
|
|
git update-ref -d refs/heads/a/b/c
|
|
)
|
|
'
|