Check for local changes with "goto"

[stgit] / t / t2800-goto-subdir.sh

diff --git a/t/t2800-goto-subdir.sh b/t/t2800-goto-subdir.sh
index 28b82924137e896ed80bbb231d30e3adb5b93aa6..855972b6669799bc5c95ad11f50dc0c556adebac 100755 (executable)
--- a/t/t2800-goto-subdir.sh
+++ b/t/t2800-goto-subdir.sh
@@ -25,7 +25,7 @@ cat > expected2.txt <<EOF
 bar
 EOF
 test_expect_success 'Goto in subdirectory (just pop)' '
 bar
 EOF
 test_expect_success 'Goto in subdirectory (just pop)' '

-    (cd foo && stg goto p1) &&
+    (cd foo && stg goto --keep p1) &&

     cat foo/bar > actual.txt &&
     test_cmp expected1.txt actual.txt &&
     ls foo > actual.txt &&
     cat foo/bar > actual.txt &&
     test_cmp expected1.txt actual.txt &&
     ls foo > actual.txt &&


@@ -48,7 +48,7 @@ cat > expected2.txt <<EOF
 bar
 EOF
 test_expect_success 'Goto in subdirectory (conflicting push)' '
 bar
 EOF
 test_expect_success 'Goto in subdirectory (conflicting push)' '

-    (cd foo && stg goto p3) ;
+    (cd foo && stg goto --keep p3) ;

     [ $? -eq 3 ] &&
     cat foo/bar > actual.txt &&
     test_cmp expected1.txt actual.txt &&
     [ $? -eq 3 ] &&
     cat foo/bar > actual.txt &&
     test_cmp expected1.txt actual.txt &&