Allow pick to import multiple patches

[stgit] / t / t0002-status.sh

diff --git a/t/t0002-status.sh b/t/t0002-status.sh
index ce3b68886cf1ce8dc5c75b689161ae21f8a4c90c..43e1ca08e4deba373408c9914cd04f85c545b3eb 100755 (executable)
--- a/t/t0002-status.sh
+++ b/t/t0002-status.sh
@@ -59,6 +59,14 @@ test_expect_success 'Status with an added file' '
     diff -u expected.txt output.txt
 '
 
+cat > expected.txt <<EOF
+foo/bar
+EOF
+test_expect_success 'Status with an added file and -n option' '
+    stg status -n > output.txt &&
+    diff -u expected.txt output.txt
+'
+
 cat > expected.txt <<EOF
 EOF
 test_expect_success 'Status after refresh' '
@@ -85,6 +93,12 @@ test_expect_success 'Status after refresh' '
     diff -u expected.txt output.txt
 '
 
+test_expect_success 'Add another file' '
+    echo lajbans > fie &&
+    stg add fie &&
+    stg refresh
+'
+
 test_expect_success 'Make a conflicting patch' '
     stg pop &&
     stg new -m "third patch" &&
@@ -104,6 +118,29 @@ test_expect_success 'Status after conflicting push' '
     diff -u expected.txt output.txt
 '
 
+cat > expected.txt <<EOF
+C foo/bar
+EOF
+test_expect_success 'Status of file' '
+    stg status foo/bar > output.txt &&
+    diff -u expected.txt output.txt
+'
+
+cat > expected.txt <<EOF
+C foo/bar
+EOF
+test_expect_success 'Status of dir' '
+    stg status foo > output.txt &&
+    diff -u expected.txt output.txt
+'
+
+cat > expected.txt <<EOF
+EOF
+test_expect_success 'Status of other file' '
+    stg status fie > output.txt &&
+    diff -u expected.txt output.txt
+'
+
 cat > expected.txt <<EOF
 M foo/bar
 EOF
@@ -122,4 +159,16 @@ test_expect_success 'Status after deleting a file' '
     diff -u expected.txt output.txt
 '
 
+cat > expected.txt <<EOF
+D foo/bar
+EOF
+test_expect_success 'Status of disappeared newborn' '
+    stg refresh &&
+    touch foo/bar &&
+    stg add foo/bar &&
+    rm foo/bar &&
+    stg status > output.txt &&
+    diff -u expected.txt output.txt
+'
+
 test_done