summaryrefslogtreecommitdiff
path: root/t/t3401-rebase-partial.sh
blob: 360a67060e1d1fd501fed7729712213360c456b2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
#!/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
 
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 &&
     git-branch master-merge master &&
     git-branch my-topic-branch-merge 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' \
    '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