86
s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
87
s/ [^ ].*/ SUBJECT/g
88
s/ [^ ].* (DATE)/ SUBJECT (DATE)/g
89
- s/for-upstream/BRANCH/g
89
+ s|tags/full|BRANCH|g
90
s/mnemonic.txt/FILENAME/g
91
s/^version [0-9]/VERSION/
92
/^ FILENAME | *[0-9]* [-+]*\$/ b diffstat
127
test_must_fail git request-pull initial "$downstream_url" \
128
2>../err
129
) &&
130
- grep "No branch of.*is at:\$" err &&
130
+ grep "No match for commit .*" err &&
131
grep "Are you sure you pushed" err
132
133
'
141
git checkout initial &&
142
git merge --ff-only master &&
143
git push origin master:for-upstream &&
144
- git request-pull initial origin >../request
144
+ git request-pull initial origin master:for-upstream >../request
145
) &&
146
sed -nf read-request.sed <request >digest &&
147
cat digest &&
160
161
'
162
163
-test_expect_success 'request names an appropriate branch' '
163
+test_expect_success 'request asks HEAD to be pulled' '
164
165
rm -fr downstream.git &&
166
git init --bare downstream.git &&
179
read repository &&
180
read branch
181
} <digest &&
182
- test "$branch" = tags/full
182
+ test -z "$branch"
183
184
'
185
212
cd local &&
213
git checkout initial &&
214
git merge --ff-only master &&
215
- git push origin master:for-upstream &&
216
- git request-pull initial "$downstream_url" >../request
215
+ git push origin tags/full &&
216
+ git request-pull initial "$downstream_url" tags/full >../request
217
) &&
218
<request sed -nf fuzz.sed >request.fuzzy &&
219
test_i18ncmp expect request.fuzzy
229
git checkout initial &&
230
git merge --ff-only master &&
231
git push origin master:for-upstream &&
232
- git request-pull -- initial "$downstream_url" >../request
232
+ git request-pull -- initial "$downstream_url" master:for-upstream >../request
233
)
234
235
'