Support tags in uncommit - use git_id instead of rev_parse

[stgit] / t / t1300-uncommit.sh

diff --git a/t/t1300-uncommit.sh b/t/t1300-uncommit.sh
index 497c354cb381071bf2d1cc5e465296f1f5e66495..2e7ff211745d413bb2fee81080407444202fbea0 100755 (executable)
--- a/t/t1300-uncommit.sh
+++ b/t/t1300-uncommit.sh
@@ -42,7 +42,7 @@ test_expect_success \
        'Uncommit the patches using names' \
        '
        stg uncommit bar foo &&
        'Uncommit the patches using names' \
        '
        stg uncommit bar foo &&

-       [ "$(stg id foo//top)" == "$(stg id bar//bottom)" ] &&
+       [ "$(stg id foo//top)" = "$(stg id bar//bottom)" ] &&

        stg commit
        '
 
        stg commit
        '
 


@@ -50,7 +50,7 @@ test_expect_success \
        'Uncommit the patches using prefix' \
        '
        stg uncommit --number=2 foobar &&
        'Uncommit the patches using prefix' \
        '
        stg uncommit --number=2 foobar &&

-       [ "$(stg id foobar1//top)" == "$(stg id foobar2//bottom)" ] &&
+       [ "$(stg id foobar1//top)" = "$(stg id foobar2//bottom)" ] &&

        stg commit
        '
 
        stg commit
        '
 


@@ -58,7 +58,7 @@ test_expect_success \
        'Uncommit the patches using auto names' \
        '
        stg uncommit --number=2 &&
        'Uncommit the patches using auto names' \
        '
        stg uncommit --number=2 &&

-       [ "$(stg id foo-patch//top)" == "$(stg id bar-patch//bottom)" ] &&
+       [ "$(stg id foo-patch//top)" = "$(stg id bar-patch//bottom)" ] &&

        stg commit
        '
 
        stg commit
        '
 


@@ -67,7 +67,15 @@ test_expect_success \
        '
        stg uncommit &&
        stg uncommit &&
        '
        stg uncommit &&
        stg uncommit &&

-       [ "$(stg id foo-patch//top)" == "$(stg id bar-patch//bottom)" ] &&
+       [ "$(stg id foo-patch//top)" = "$(stg id bar-patch//bottom)" ] &&

        stg commit
        '
        stg commit
        '

+
+test_expect_success \
+    'Uncommit the patches with --to' '
+    stg uncommit --to HEAD^ &&
+    [ "$(stg id foo-patch//top)" = "$(stg id bar-patch//bottom)" ] &&
+    stg commit
+'
+

 test_done
 test_done