Fixes to the pull testcases.

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>

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index 142f894c4d1ca805d17f40fa867de921eeb741eb..e5fac882048e9e8061a0cce5b3fb967a29d91fff 100755 (executable)
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -34,9 +34,21 @@ test_expect_success \
      )
 "
 
+test_expect_success \
+    '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' \
-    "(cd bar && stg pull
+    "(cd bar && stg push --all --merged
      )
 "