From: Yann Dirson Date: Tue, 12 Jun 2007 21:57:06 +0000 (+0100) Subject: Revert 'Test "stg rebase" after "stg commit"' X-Git-Tag: v0.14.3~208 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/e4b8c5e722121c824d1c767f52f97c08fd6b5ca5?hp=57c05b31aa2ce889e818d38f8c927c6098727f9e Revert 'Test "stg rebase" after "stg commit"' This patch is reverting commit a02ba4077f12578fe31c99d903488804a656e1c4 (author Karl but assigned to Yann in error). Signed-off-by: Catalin Marinas --- diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh index d9b6faf..c142e08 100755 --- a/t/t2200-rebase.sh +++ b/t/t2200-rebase.sh @@ -43,20 +43,4 @@ test_expect_success \ test $(stg applied | wc -l) = 1 ' -test_expect_success \ - 'Rebase to next commit' \ - ' - stg rebase master && - test $(stg id base@stack) = $(git rev-parse master) - ' - -test_expect_success \ - 'Commit the patch and rebase again' \ - ' - stg commit && - git tag committed-here && - stg rebase master && - test $(stg id base@stack) = $(git rev-parse master) - ' - test_done