Fix error in status.py when calling git.resolved

[stgit] / t / t1205-push-subdir.sh

diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
index f9a84f6182808ad487d46e7eb1a808bcd7e35033..175d36d2888987b85505de8810183217e63b3ba2 100755 (executable)
--- a/t/t1205-push-subdir.sh
+++ b/t/t1205-push-subdir.sh
@@ -9,7 +9,7 @@ test_expect_success 'Create some patches' '
         stg new p$i -m p$i &&
         echo x$i >> x.txt &&
         echo y$i >> foo/y.txt &&
         stg new p$i -m p$i &&
         echo x$i >> x.txt &&
         echo y$i >> foo/y.txt &&

-        stg add x.txt foo/y.txt &&
+        git add x.txt foo/y.txt &&

         stg refresh
     done &&
     [ "$(echo $(stg applied))" = "p0 p1 p2" ] &&
         stg refresh
     done &&
     [ "$(echo $(stg applied))" = "p0 p1 p2" ] &&


@@ -33,7 +33,7 @@ test_expect_success 'Modifying push from a subdir' '
     [ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
     stg new extra -m extra &&
     echo extra >> extra.txt &&
     [ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
     stg new extra -m extra &&
     echo extra >> extra.txt &&

-    stg add extra.txt &&
+    git add extra.txt &&

     stg refresh &&
     cd foo &&
     stg push &&
     stg refresh &&
     cd foo &&
     stg push &&


@@ -52,4 +52,18 @@ test_expect_success 'Conflicting push from subdir' '
     [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
 '
 
     [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
 '
 

+test_expect_success 'Conflicting add/unknown file in subdir' '
+    stg status --reset &&
+    stg new foo -m foo &&
+    mkdir d &&
+    echo foo > d/test &&
+    git add d/test &&
+    stg refresh &&
+    stg pop &&
+    mkdir -p d &&
+    echo bar > d/test &&
+    ! stg push foo &&
+    [ $(stg top) != "foo" ]
+'
+

 test_done
 test_done