New test: try "stg refresh" in a subdirectory

[stgit] / t / t1301-assimilate.sh

diff --git a/t/t1301-assimilate.sh b/t/t1301-assimilate.sh
index 26b263c21e2ad669409ce26e450cd3280ae22b84..7f47c3186d39f331b79b1fcace48338c7d91e207 100755 (executable)
--- a/t/t1301-assimilate.sh
+++ b/t/t1301-assimilate.sh
@@ -5,7 +5,7 @@ test_description='Test the assimilate command.'
 
 test_expect_success \
     'Assimilate in a non-initialized repository' \
-    'stg assimilate'
+    '! stg assimilate'
 
 test_expect_success \
     'Initialize the StGIT repository' \
@@ -65,7 +65,7 @@ test_expect_success \
     '
 
 test_expect_success \
-    'Create a mege commit' \
+    'Create a merge commit' \
     '
     git checkout -b br master^^ &&
     echo woof > woof.txt &&
@@ -75,12 +75,10 @@ test_expect_success \
     git pull . br
     '
 
-test_expect_success \
-    'Try (and fail) to assimilate the merge commit' \
-    '
+test_expect_success 'Assimilate in the presence of a merge commit' '
     [ $(stg applied | wc -l) -eq 5 ] &&
-    ! stg assimilate &&
-    [ $(stg applied | wc -l) -eq 5 ]
-    '
+    stg assimilate &&
+    [ $(stg applied | wc -l) -eq 0 ]
+'
 
 test_done