Initial bulk commit for "Git on MSys"
[msysgit/historical-msysgit.git] / git / t / t3401-rebase-partial.sh
blob4934a4e01092e27e07254b10ed3e54e8699b54ac
1 #!/bin/sh
3 # Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
6 test_description='git rebase should detect patches integrated upstream
8 This test cherry-picks one local change of two into master branch, and
9 checks that git rebase succeeds with only the second patch in the
10 local branch.
12 . ./test-lib.sh
14 test_expect_success \
15 'prepare repository with topic branch' \
16 'echo First > A &&
17 git update-index --add A &&
18 git-commit -m "Add A." &&
20 git-checkout -b my-topic-branch &&
22 echo Second > B &&
23 git update-index --add B &&
24 git-commit -m "Add B." &&
26 echo AnotherSecond > C &&
27 git update-index --add C &&
28 git-commit -m "Add C." &&
30 git-checkout -f master &&
32 echo Third >> A &&
33 git update-index A &&
34 git-commit -m "Modify A."
37 test_expect_success \
38 'pick top patch from topic branch into master' \
39 'git cherry-pick my-topic-branch^0 &&
40 git-checkout -f my-topic-branch &&
41 git branch master-merge master &&
42 git branch my-topic-branch-merge my-topic-branch
45 test_debug \
46 'git cherry master &&
47 git format-patch -k --stdout --full-index master >/dev/null &&
48 gitk --all & sleep 1
51 test_expect_success \
52 'rebase topic branch against new master and check git-am did not get halted' \
53 'git-rebase master && test ! -d .dotest'
55 test_expect_success \
56 'rebase --merge topic branch that was partially merged upstream' \
57 'git-checkout -f my-topic-branch-merge &&
58 git-rebase --merge master-merge &&
59 test ! -d .git/.dotest-merge'
61 test_done