[PATCH 4/7] Add a test for rebase when a change was picked upstream

This test exercises the standard feature that makes rebase useful.

Signed-off-by: Yann Dirson <redacted>


---

 t/t3401-rebase-partial.sh |   57 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100755 t/t3401-rebase-partial.sh

90bb1e981d99331bdc39acb2ab97ed0c88b06630

diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
new file mode 100755
index 0000000..7c2d7f9
--- /dev/null
+++ b/t/t3401-rebase-partial.sh

@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
+#
+
+test_description='git rebase should detect patches integrated upstream
+
+This test cherry-picks one local change of two into master branch, and
+checks that git rebase succeeds with only the second patch in the
+local branch.
+'
+. ./test-lib.sh
+
+export GIT_AUTHOR_EMAIL=bogus_email_address
+
+test_expect_success \
+    'prepare repository with topic branch' \
+    'echo First > A &&
+     git-update-index --add A &&
+     git-commit -m "Add A." &&
+
+     git-checkout -b my-topic-branch &&
+
+     echo Second > B &&
+     git-update-index --add B &&
+     git-commit -m "Add B." &&
+
+     echo AnotherSecond > C &&
+     git-update-index --add C &&
+     git-commit -m "Add C." &&
+
+     git-checkout -f master &&
+
+     echo Third >> A &&
+     git-update-index A &&
+     git-commit -m "Modify A."
+'
+
+test_expect_success \
+    'pick top patch from topic branch into master' \
+    'git-cherry-pick my-topic-branch^0 &&
+     git-checkout -f my-topic-branch
+'
+
+test_debug \
+    'git-cherry master &&
+     git-format-patch -k --stdout --full-index master >/dev/null &&
+     gitk --all & sleep 1
+'
+
+test_expect_success \
+    'rebase topic branch against new master and check git-am did not get halted' \
+    'sh -x git-rebase master &&
+     test ! -d .dotest
+'
+
+test_done

-- 
1.0.6-g8ecb

-- 
Yann Dirson    <ydirson@altern.org> |
Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>

Yann Dirson [off-list ref] writes:

+export GIT_AUTHOR_EMAIL=bogus_email_address

This is probably not needed for this test, although it would not
hurt.

+test_expect_success \
+    'rebase topic branch against new master and check git-am did not get halted' \
+    'sh -x git-rebase master &&
+     test ! -d .dotest
+'

Some people build git with SHELL_PATH=/bin/bash because their
/bin/sh is not POSIX enough (e.g. Solaris).  Perhaps emulate
what t5501 does?

On Sat, Jan 07, 2006 at 06:22:29PM -0800, Junio C Hamano wrote:

Yann Dirson [off-list ref] writes:

quoted

+export GIT_AUTHOR_EMAIL=bogus_email_address

This is probably not needed for this test, although it would not
hurt.

Inheritance from t3400 :)

quoted

+test_expect_success \
+    'rebase topic branch against new master and check git-am did not get halted' \
+    'sh -x git-rebase master &&
+     test ! -d .dotest
+'

Some people build git with SHELL_PATH=/bin/bash because their
/bin/sh is not POSIX enough (e.g. Solaris).  Perhaps emulate
what t5501 does?

Oh, that "sh -x" is only a forgotten debugging item, I'll drop it.

-- 
Yann Dirson    [off-list ref] |
Debian-related: [off-list ref] |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>