[PATCH v0 2/3] t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C

From

Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

Date

May 21, 2009, 09:47 UTC

Message-ID

<1242899229-27603-2-git-send-email-pclouds@gmail.com>

In-Reply-To

<1242899229-27603-1-git-send-email-pclouds@gmail.com>

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 t/t3400-rebase.sh |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 6e391a3..37f86ab 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -41,9 +41,37 @@ test_expect_success \
      git tag topic
 '
 
+test_expect_success 'rebase on dirty worktree' '
+     echo dirty >> A &&
+     ! git rebase master'
+
+test_expect_success 'rebase on dirty cache' '
+     git add  A &&
+     ! git rebase master'
+
 test_expect_success 'rebase against master' '
+     git reset HEAD &&
+     git checkout -f &&
      git rebase master'
 
+test_expect_success 'rebase against master twice' '
+	git rebase master 2>&1|grep "Current branch my-topic-branch is up to date\\."
+'
+
+test_expect_success 'rebase against master twice with --force' '
+	git rebase --force-rebase master 2>&1|grep "Current branch my-topic-branch is up to date, rebase forced"
+'
+
+test_expect_success 'rebase against master twice from another branch' '
+	git checkout my-topic-branch^ &&
+	git rebase master my-topic-branch 2>&1|grep "Current branch my-topic-branch is up to date\\."
+'
+
+test_expect_success 'rebase fast-forward to master' '
+	git checkout my-topic-branch^ &&
+	git rebase my-topic-branch 2>&1|grep "Fast-forwarded HEAD to my-topic-branch"
+'
+
 test_expect_success \
     'the rebase operation should not have destroyed author information' \
     '! (git log | grep "Author:" | grep "<>")'

-- 
test