From: Yann Dirson Date: Sun, 03 Jun 2007 13:41:57 GMT Subject: [PATCH 2/2] Test "stg rebase" after "stg commit" Message-ID: <20070603134157.1681.70969.stgit@gandelf.nowhere.earth> In-Reply-To: <20070603133006.1681.1742.stgit@gandelf.nowhere.earth> Two new tests for "stg rebase": 1. Try to rebase to a commit that is ahead of HEAD. This should work, and does. 2. Try to commit a patch, and then rebase. This doesn't work, because "stg rebase" aborts if orig-base != base, and "stg commit" doesn't update orig-base. (It does work if "stg rebase" is given the --force flag.) Signed-off-by: Karl Hasselström Signed-off-by: Karl Hasselström --- t/t2200-rebase.sh | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh index 52462dd..b48e513 100755 --- a/t/t2200-rebase.sh +++ b/t/t2200-rebase.sh @@ -30,4 +30,20 @@ test_expect_success \ test `stg id base@stack` = `git rev-parse master~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