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 142f894..e5fac88 100755 (executable)
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -35,8 +35,20 @@ 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
      )
 "