diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-24 18:29:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-25 00:38:34 -0700 |
| commit | 9a99c087da7cd6b4a41c19df3053542f645315c5 (patch) | |
| tree | e639c4ffdc84d047d993722cac034c7c7ddf56e9 /t/t3401-rebase-partial.sh | |
| parent | 29f4ad867cd15f4029c280c417f4a0866d5229a9 (diff) | |
| download | git-9a99c087da7cd6b4a41c19df3053542f645315c5.tar.gz git-9a99c087da7cd6b4a41c19df3053542f645315c5.tar.xz | |
rebase: allow --merge option to handle patches merged upstream
Enhance t3401-rebase-partial to test with --merge as well as
the standard am -3 strategy.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3401-rebase-partial.sh')
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 32dc9c5e7..360a67060 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -37,7 +37,9 @@ test_expect_success \ test_expect_success \ 'pick top patch from topic branch into master' \ 'git-cherry-pick my-topic-branch^0 && - git-checkout -f my-topic-branch + git-checkout -f my-topic-branch && + git-branch master-merge master && + git-branch my-topic-branch-merge my-topic-branch ' test_debug \ @@ -50,4 +52,13 @@ test_expect_success \ 'rebase topic branch against new master and check git-am did not get halted' \ 'git-rebase master && test ! -d .dotest' +if test -z "$no_python" +then + test_expect_success \ + 'rebase --merge topic branch that was partially merged upstream' \ + 'git-checkout -f my-topic-branch-merge && + git-rebase --merge master-merge && + test ! -d .git/.dotest-merge' +fi + test_done |