Fix error in status.py when calling git.resolved

[stgit] / t / t1600-delete-one.sh

diff --git a/t/t1600-delete-one.sh b/t/t1600-delete-one.sh
index d59d4baffc3b05d68c800d1016d499d0c5f611e3..c3451d827eaeab07a3c62f21e2210b14255c7714 100755 (executable)
--- a/t/t1600-delete-one.sh
+++ b/t/t1600-delete-one.sh
@@ -12,7 +12,7 @@ test_expect_success \
     '
     stg new foo -m foo &&
     echo foo > foo.txt &&
     '
     stg new foo -m foo &&
     echo foo > foo.txt &&

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

     stg refresh
     '
 
     stg refresh
     '
 


@@ -47,7 +47,7 @@ test_expect_success \
     '
     stg new foo -m foo &&
     echo foo > foo.txt &&
     '
     stg new foo -m foo &&
     echo foo > foo.txt &&

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

     stg refresh &&
     stg pop
     '
     stg refresh &&
     stg pop
     '


@@ -65,11 +65,11 @@ test_expect_success \
     '
     stg new foo -m foo &&
     echo foo > foo.txt &&
     '
     stg new foo -m foo &&
     echo foo > foo.txt &&

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

     stg refresh &&
     stg new bar -m bar &&
     echo bar > bar.txt &&
     stg refresh &&
     stg new bar -m bar &&
     echo bar > bar.txt &&

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

     stg refresh
     '
 
     stg refresh
     '
 


@@ -77,16 +77,7 @@ test_expect_success \
     'Try to delete a non-topmost applied patch' \
     '
     [ $(stg applied | wc -l) -eq 2 ] &&
     'Try to delete a non-topmost applied patch' \
     '
     [ $(stg applied | wc -l) -eq 2 ] &&

-    ! stg delete foo &&
-    [ $(stg applied | wc -l) -eq 2 ]
-    '
-
-test_expect_success \
-    'Hide the topmost patch and try to delete it' \
-    '
-    [ $(stg applied | wc -l) -eq 2 ] &&
-    stg hide bar &&
-    stg delete bar &&
+    stg delete foo &&

     [ $(stg applied | wc -l) -eq 1 ]
     '
 
     [ $(stg applied | wc -l) -eq 1 ]
     '
 


@@ -96,12 +87,12 @@ test_expect_success \
     stg branch --create br &&
     stg new baz -m baz &&
     echo baz > baz.txt &&
     stg branch --create br &&
     stg new baz -m baz &&
     echo baz > baz.txt &&

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

     stg refresh &&
     stg branch master &&
     stg new baz -m baz &&
     echo baz > baz.txt &&
     stg refresh &&
     stg branch master &&
     stg new baz -m baz &&
     echo baz > baz.txt &&

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

     stg refresh
     '
 
     stg refresh
     '