~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a boundary to parse_patches in pick.py
[stgit]
/
t
/
t1201-pull-trailing.sh
diff --git
a/t/t1201-pull-trailing.sh
b/t/t1201-pull-trailing.sh
index
142f894
..
46d9f82
100755
(executable)
--- a/
t/t1201-pull-trailing.sh
+++ b/
t/t1201-pull-trailing.sh
@@
-28,15
+28,28
@@
test_expect_success \
test_expect_success \
'Port those patches to orig tree' \
test_expect_success \
'Port those patches to orig tree' \
- "(cd foo &&
- GIT_DIR=../bar/.git git-format-patch --stdout bases/master..HEAD |
+ '(cd foo &&
+ GIT_DIR=../bar/.git git-format-patch --stdout \
+ $(cd ../bar && stg id base@master)..HEAD |
git-am -3 -k
)
git-am -3 -k
)
+ '
+
+test_expect_success \
+ 'Pull those patches applied upstream, without pushing' \
+ "(cd bar && stg pull --nopush
+ )
+"
+
+test_expect_success \
+ 'Try to push those patches without merge detection' \
+ "(cd bar && stg push --all
+ )
"
test_expect_success \
'Pull those patches applied upstream' \
"
test_expect_success \
'Pull those patches applied upstream' \
- "(cd bar && stg pu
ll
+ "(cd bar && stg pu
sh --undo && stg push --all --merged
)
"
)
"