blob: 7786079ba51aeb1c4e374c56b32fe4650638e0ad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL/porcelain)" '
write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
-r "option old-oid $A" \
-r "option new-oid $B" \
-r "ok refs/for/main/topic" \
-r "option refname refs/changes/24/124/1" \
-r "option old-oid $ZERO_OID" \
-r "option new-oid $A" \
-r "ok refs/for/main/topic" \
-r "option refname refs/changes/25/125/1" \
-r "option old-oid $A" \
-r "option new-oid $B"
EOF
'
# Refs of upstream : main(A)
# Refs of workbench: main(A) tags/v123
# git push : refs/for/main/topic(A)
test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL/porcelain)" '
git -C workbench push --porcelain origin \
HEAD:refs/for/main/topic \
>out 2>&1 &&
make_user_friendly_and_stable_output <out >actual &&
format_and_save_expect <<-EOF &&
> remote: # pre-receive hook Z
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
> remote: # proc-receive hook Z
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option old-oid <COMMIT-A> Z
> remote: proc-receive> option new-oid <COMMIT-B> Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option refname refs/changes/24/124/1 Z
> remote: proc-receive> option old-oid <ZERO-OID> Z
> remote: proc-receive> option new-oid <COMMIT-A> Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option refname refs/changes/25/125/1 Z
> remote: proc-receive> option old-oid <COMMIT-A> Z
> remote: proc-receive> option new-oid <COMMIT-B> Z
> remote: # post-receive hook Z
> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic Z
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1 Z
> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1 Z
> To <URL/of/upstream.git>
> HEAD:refs/for/main/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 &&
test_cmp_refs -C "$upstream" <<-EOF
<COMMIT-A> refs/heads/main
EOF
'
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL/porcelain)" '
write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
-r "option refname refs/changes/24/124/1" \
-r "option old-oid $ZERO_OID" \
-r "option new-oid $A" \
-r "ok refs/for/main/topic" \
-r "option old-oid $A" \
-r "option new-oid $B" \
-r "ok refs/for/main/topic" \
-r "option refname refs/changes/25/125/1" \
-r "option old-oid $B" \
-r "option new-oid $A" \
-r "option forced-update"
EOF
'
# Refs of upstream : main(A)
# Refs of workbench: main(A) tags/v123
# git push : refs/for/main/topic(A)
test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL/porcelain)" '
git -C workbench push --porcelain origin \
HEAD:refs/for/main/topic \
>out 2>&1 &&
make_user_friendly_and_stable_output <out >actual &&
format_and_save_expect <<-EOF &&
> remote: # pre-receive hook Z
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
> remote: # proc-receive hook Z
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option refname refs/changes/24/124/1 Z
> remote: proc-receive> option old-oid <ZERO-OID> Z
> remote: proc-receive> option new-oid <COMMIT-A> Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option old-oid <COMMIT-A> Z
> remote: proc-receive> option new-oid <COMMIT-B> Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option refname refs/changes/25/125/1 Z
> remote: proc-receive> option old-oid <COMMIT-B> Z
> remote: proc-receive> option new-oid <COMMIT-A> Z
> remote: proc-receive> option forced-update Z
> remote: # post-receive hook Z
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1 Z
> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic Z
> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1 Z
> To <URL/of/upstream.git>
> * HEAD:refs/changes/24/124/1 [new reference]
> HEAD:refs/for/main/topic <OID-A>..<OID-B>
> + HEAD:refs/changes/25/125/1 <OID-B>...<OID-A> (forced update)
> Done
EOF
test_cmp expect actual &&
test_cmp_refs -C "$upstream" <<-EOF
<COMMIT-A> refs/heads/main
EOF
'
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL/porcelain)" '
write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
-r "option refname refs/changes/23/123/1" \
-r "ok refs/for/main/topic" \
-r "option refname refs/changes/24/124/2" \
-r "option old-oid $A" \
-r "option new-oid $B"
EOF
'
# Refs of upstream : main(A)
# Refs of workbench: main(A) tags/v123
# git push : refs/for/main/topic(A)
test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porcelain)" '
git -C workbench push --porcelain origin \
HEAD:refs/for/main/topic \
>out 2>&1 &&
make_user_friendly_and_stable_output <out >actual &&
format_and_save_expect <<-EOF &&
> remote: # pre-receive hook Z
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
> remote: # proc-receive hook Z
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option refname refs/changes/23/123/1 Z
> remote: proc-receive> ok refs/for/main/topic Z
> remote: proc-receive> option refname refs/changes/24/124/2 Z
> remote: proc-receive> option old-oid <COMMIT-A> Z
> remote: proc-receive> option new-oid <COMMIT-B> Z
> remote: # post-receive hook Z
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1 Z
> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2 Z
> To <URL/of/upstream.git>
> * HEAD:refs/changes/23/123/1 [new reference]
> HEAD:refs/changes/24/124/2 <OID-A>..<OID-B>
> Done
EOF
test_cmp expect actual &&
test_cmp_refs -C "$upstream" <<-EOF
<COMMIT-A> refs/heads/main
EOF
'
|
