summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
94d1886)
As mentionned earlier, the original testcases do not take --merged
into account. Let's expect the push to fail without it, and succeed
with it.
Signed-off-by: Yann Dirson <ydirson@altern.org>
+ 'Pull those patches applied upstream, without pushing' \
+ "(cd bar && stg pull --nopush
+ )
+"
+
+test_expect_failure \
+ 'Try to push those patches without merge detection' \
+ "(cd bar && stg push --all
+ )
+"
+
+test_expect_success \
'Pull those patches applied upstream' \
'Pull those patches applied upstream' \
+ "(cd bar && stg push --all --merged