X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d926892f4f058326d8e7efc61f7ae4f54b8a02b2..a0689e114cdccceedc366e1bfa5be00ad62b2a31:/t/t0002-status.sh?ds=sidebyside

diff --git a/t/t0002-status.sh b/t/t0002-status.sh
index 4364709..c978845 100755
--- a/t/t0002-status.sh
+++ b/t/t0002-status.sh
@@ -54,7 +54,7 @@ cat > expected.txt <<EOF
 A foo/bar
 EOF
 test_expect_success 'Status with an added file' '
-    git add foo &&
+    stg add foo &&
     stg status > output.txt &&
     test_cmp expected.txt output.txt
 '
@@ -95,7 +95,7 @@ test_expect_success 'Status after refresh' '
 
 test_expect_success 'Add another file' '
     echo lajbans > fie &&
-    git add fie &&
+    stg add fie &&
     stg refresh
 '
 
@@ -107,14 +107,11 @@ test_expect_success 'Make a conflicting patch' '
 '
 
 cat > expected.txt <<EOF
-? foo/bar.ancestor
-? foo/bar.current
-? foo/bar.patched
 A fie
 C foo/bar
 EOF
 test_expect_success 'Status after conflicting push' '
-    ! stg push &&
+    conflict stg push &&
     stg status > output.txt &&
     test_cmp expected.txt output.txt
 '
@@ -148,7 +145,7 @@ A fie
 M foo/bar
 EOF
 test_expect_success 'Status after resolving the push' '
-    stg resolved -a &&
+    stg add --update &&
     stg status > output.txt &&
     test_cmp expected.txt output.txt
 '
@@ -169,10 +166,27 @@ EOF
 test_expect_success 'Status of disappeared newborn' '
     stg refresh &&
     touch foo/bar &&
-    git add foo/bar &&
+    stg add foo/bar &&
     rm foo/bar &&
     stg status > output.txt &&
     test_cmp expected.txt output.txt
 '
 
+cat > expected.txt <<EOF
+A fay
+D fie
+EOF
+test_expect_success 'Status after renaming a file' '
+    stg rm foo/bar &&
+    stg mv fie fay &&
+    stg status > output.txt &&
+    test_cmp expected.txt output.txt
+'
+
+test_expect_success 'Status after renaming a file (with rename detection)' '
+    git config stgit.diff-opts -M &&
+    stg status > output.txt &&
+    test_cmp expected.txt output.txt
+'
+
 test_done