Fix error in status.py when calling git.resolved

[stgit] / t / t1201-pull-trailing.sh

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

      )
 "
 
 test_expect_success \
     'Check that all went well' \
      )
 "
 
 test_expect_success \
     'Check that all went well' \

-    "diff -u foo/file bar/file
+    "test_cmp foo/file bar/file

 "
 
 test_done
 "
 
 test_done