Prepare for 2.15.2
[git/git.git] / t / t3418-rebase-continue.sh
CommitLineData
25e93250
DK
1#!/bin/sh
2
3test_description='git rebase --continue tests'
4
5. ./test-lib.sh
6
7. "$TEST_DIRECTORY"/lib-rebase.sh
8
9set_fake_editor
10
11test_expect_success 'setup' '
12 test_commit "commit-new-file-F1" F1 1 &&
13 test_commit "commit-new-file-F2" F2 2 &&
14
15 git checkout -b topic HEAD^ &&
16 test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
17
18 git checkout master
19'
20
21test_expect_success 'interactive rebase --continue works with touched file' '
22 rm -fr .git/rebase-* &&
23 git reset --hard &&
24 git checkout master &&
25
26 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
27 test-chmtime =-60 F1 &&
28 git rebase --continue
29'
30
31test_expect_success 'non-interactive rebase --continue works with touched file' '
32 rm -fr .git/rebase-* &&
33 git reset --hard &&
34 git checkout master &&
35
36 test_must_fail git rebase --onto master master topic &&
37 echo "Resolved" >F2 &&
38 git add F2 &&
39 test-chmtime =-60 F1 &&
40 git rebase --continue
41'
42
95135b06
MZ
43test_expect_success 'rebase --continue can not be used with other options' '
44 test_must_fail git rebase -v --continue &&
45 test_must_fail git rebase --continue -v
46'
47
80ff4795
MZ
48test_expect_success 'rebase --continue remembers merge strategy and options' '
49 rm -fr .git/rebase-* &&
50 git reset --hard commit-new-file-F2-on-topic-branch &&
51 test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
52 test_when_finished "rm -fr test-bin funny.was.run" &&
53 mkdir test-bin &&
02380389 54 cat >test-bin/git-merge-funny <<-EOF &&
80ff4795
MZ
55 #!$SHELL_PATH
56 case "\$1" in --opt) ;; *) exit 2 ;; esac
57 shift &&
58 >funny.was.run &&
59 exec git merge-recursive "\$@"
60 EOF
61 chmod +x test-bin/git-merge-funny &&
62 (
63 PATH=./test-bin:$PATH
64 test_must_fail git rebase -s funny -Xopt master topic
65 ) &&
66 test -f funny.was.run &&
67 rm funny.was.run &&
68 echo "Resolved" >F2 &&
69 git add F2 &&
70 (
71 PATH=./test-bin:$PATH
72 git rebase --continue
73 ) &&
74 test -f funny.was.run
75'
76
5fb415b5 77test_expect_success 'setup rerere database' '
b3e4847e
MZ
78 rm -fr .git/rebase-* &&
79 git reset --hard commit-new-file-F3-on-topic-branch &&
02380389 80 git checkout master &&
b3e4847e 81 test_commit "commit-new-file-F3" F3 3 &&
5fb415b5 82 test_config rerere.enabled true &&
b3e4847e
MZ
83 test_must_fail git rebase -m master topic &&
84 echo "Resolved" >F2 &&
5fb415b5 85 cp F2 expected-F2 &&
b3e4847e
MZ
86 git add F2 &&
87 test_must_fail git rebase --continue &&
88 echo "Resolved" >F3 &&
5fb415b5 89 cp F3 expected-F3 &&
b3e4847e
MZ
90 git add F3 &&
91 git rebase --continue &&
5fb415b5 92 git reset --hard topic@{1}
b3e4847e
MZ
93'
94
5fb415b5
PW
95prepare () {
96 rm -fr .git/rebase-* &&
97 git reset --hard commit-new-file-F3-on-topic-branch &&
98 git checkout master &&
99 test_config rerere.enabled true
100}
101
102test_rerere_autoupdate () {
103 action=$1 &&
104 test_expect_success "rebase $action --continue remembers --rerere-autoupdate" '
105 prepare &&
106 test_must_fail git rebase $action --rerere-autoupdate master topic &&
107 test_cmp expected-F2 F2 &&
108 git diff-files --quiet &&
109 test_must_fail git rebase --continue &&
110 test_cmp expected-F3 F3 &&
111 git diff-files --quiet &&
112 git rebase --continue
113 '
114
115 test_expect_success "rebase $action --continue honors rerere.autoUpdate" '
116 prepare &&
117 test_config rerere.autoupdate true &&
118 test_must_fail git rebase $action master topic &&
119 test_cmp expected-F2 F2 &&
120 git diff-files --quiet &&
121 test_must_fail git rebase --continue &&
122 test_cmp expected-F3 F3 &&
123 git diff-files --quiet &&
124 git rebase --continue
125 '
126
127 test_expect_success "rebase $action --continue remembers --no-rerere-autoupdate" '
128 prepare &&
129 test_config rerere.autoupdate true &&
130 test_must_fail git rebase $action --no-rerere-autoupdate master topic &&
131 test_cmp expected-F2 F2 &&
132 test_must_fail git diff-files --quiet &&
133 git add F2 &&
134 test_must_fail git rebase --continue &&
135 test_cmp expected-F3 F3 &&
136 test_must_fail git diff-files --quiet &&
137 git add F3 &&
138 git rebase --continue
139 '
140}
141
142test_rerere_autoupdate
143test_rerere_autoupdate -m
9b6d7a62
PW
144GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
145test_rerere_autoupdate -i
146test_rerere_autoupdate --preserve-merges
5fb415b5 147
25e93250 148test_done