@@ -163,7 +163,7 @@ test_expect_success 'Apply a patch and edit message' '
163
163
stg delete ..
164
164
'
165
165
166
- test_expect_success STG_IMPORT_URL ' Apply a patch from a URL' '
166
+ test_expect_success ! MINGW, STG_IMPORT_URL ' Apply a patch from a URL' '
167
167
stg import -u "file://$TEST_DIRECTORY/t1800/git-diff" &&
168
168
[ $(git cat-file -p $(stg id) \
169
169
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
@@ -255,21 +255,23 @@ test_expect_success 'Apply a series from a tarball' '
255
255
stg delete ..
256
256
'
257
257
258
- test_expect_success STG_IMPORT_URL ' Apply a series from a tarball url' '
258
+ test_expect_success ! MINGW, STG_IMPORT_URL ' Apply a series from a tarball url' '
259
259
stg import --url --series "file://$(pwd)/jabberwocky.tar.bz2" &&
260
260
[ $(git cat-file -p $(stg id) \
261
- | grep -c "tree 2c33937252a21f1550c0bf21f1de534b68f69635") = 1 ]
261
+ | grep -c "tree 2c33937252a21f1550c0bf21f1de534b68f69635") = 1 ] &&
262
+ stg show | grep -e "Author: Clark Williams <[email protected] >" &&
263
+ stg delete ..
262
264
'
263
265
264
- test_expect_success ! STG_IMPORT_URL ' Apply a series from a abs tarball path' '
266
+ test_expect_success ' Apply a series from a abs tarball path' '
265
267
stg import --series "$(pwd)/jabberwocky.tar.bz2" &&
266
268
[ $(git cat-file -p $(stg id) \
267
- | grep -c "tree 2c33937252a21f1550c0bf21f1de534b68f69635") = 1 ]
269
+ | grep -c "tree 2c33937252a21f1550c0bf21f1de534b68f69635") = 1 ] &&
270
+ stg show | grep -e "Author: Clark Williams <[email protected] >" &&
271
+ stg delete --top --spill
268
272
'
269
273
270
274
test_expect_success ' Import with author options' '
271
- stg show | grep -e "Author: Clark Williams <[email protected] >" &&
272
- stg delete --top --spill &&
273
275
stg diff >some.patch &&
274
276
git reset jabberwocky.txt &&
275
277
git checkout jabberwocky.txt &&
0 commit comments