]>
Commit | Line | Data |
---|---|---|
59e6b23a JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano. | |
4 | # | |
5 | ||
b758789c | 6 | USAGE='[-v] [--onto <newbase>] <upstream> [<branch>]' |
031321c6 SE |
7 | LONG_USAGE='git-rebase replaces <branch> with a new branch of the |
8 | same name. When the --onto option is provided the new branch starts | |
9 | out with a HEAD equal to <newbase>, otherwise it is equal to <upstream> | |
10 | It then attempts to create a new commit for each commit from the original | |
11 | <branch> that does not exist in the <upstream> branch. | |
69a60af5 | 12 | |
031321c6 SE |
13 | It is possible that a merge failure will prevent this process from being |
14 | completely automatic. You will have to resolve any such merge failure | |
cc120056 SE |
15 | and run git rebase --continue. Another option is to bypass the commit |
16 | that caused the merge failure with git rebase --skip. To restore the | |
17 | original <branch> and remove the .dotest working files, use the command | |
18 | git rebase --abort instead. | |
69a60af5 | 19 | |
031321c6 SE |
20 | Note that if <branch> is not specified on the command line, the |
21 | currently checked out branch is used. You must be in the top | |
22 | directory of your project to start (or continue) a rebase. | |
e646c9c8 | 23 | |
031321c6 | 24 | Example: git-rebase master~1 topic |
e646c9c8 | 25 | |
031321c6 SE |
26 | A---B---C topic A'\''--B'\''--C'\'' topic |
27 | / --> / | |
28 | D---E---F---G master D---E---F---G master | |
e646c9c8 | 29 | ' |
533b7039 JH |
30 | |
31 | SUBDIRECTORY_OK=Yes | |
ae2b0f15 | 32 | . git-sh-setup |
f9474132 | 33 | set_reflog_action rebase |
7eff28a9 | 34 | require_work_tree |
533b7039 | 35 | cd_to_toplevel |
4282c4fb | 36 | |
cc120056 SE |
37 | RESOLVEMSG=" |
38 | When you have resolved this problem run \"git rebase --continue\". | |
39 | If you would prefer to skip this patch, instead run \"git rebase --skip\". | |
40 | To restore the original branch and stop rebasing run \"git rebase --abort\". | |
41 | " | |
e646c9c8 | 42 | unset newbase |
a06f678e | 43 | strategy=recursive |
58634dbf EW |
44 | do_merge= |
45 | dotest=$GIT_DIR/.dotest-merge | |
46 | prec=4 | |
b758789c | 47 | verbose= |
58634dbf EW |
48 | |
49 | continue_merge () { | |
50 | test -n "$prev_head" || die "prev_head must be defined" | |
51 | test -d "$dotest" || die "$dotest directory does not exist" | |
52 | ||
53 | unmerged=$(git-ls-files -u) | |
54 | if test -n "$unmerged" | |
55 | then | |
56 | echo "You still have unmerged paths in your index" | |
57 | echo "did you forget update-index?" | |
66eb64cb | 58 | die "$RESOLVEMSG" |
58634dbf EW |
59 | fi |
60 | ||
61 | if test -n "`git-diff-index HEAD`" | |
62 | then | |
f0ef0596 EW |
63 | if ! git-commit -C "`cat $dotest/current`" |
64 | then | |
65 | echo "Commit failed, please do not call \"git commit\"" | |
66 | echo "directly, but instead do one of the following: " | |
67 | die "$RESOLVEMSG" | |
68 | fi | |
9e4bc7dd | 69 | printf "Committed: %0${prec}d" $msgnum |
58634dbf | 70 | else |
9e4bc7dd | 71 | printf "Already applied: %0${prec}d" $msgnum |
58634dbf | 72 | fi |
9e4bc7dd EW |
73 | echo ' '`git-rev-list --pretty=oneline -1 HEAD | \ |
74 | sed 's/^[a-f0-9]\+ //'` | |
58634dbf EW |
75 | |
76 | prev_head=`git-rev-parse HEAD^0` | |
58634dbf | 77 | # save the resulting commit so we can read-tree on it later |
58634dbf EW |
78 | echo "$prev_head" > "$dotest/prev_head" |
79 | ||
80 | # onto the next patch: | |
81 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 82 | echo "$msgnum" >"$dotest/msgnum" |
58634dbf EW |
83 | } |
84 | ||
85 | call_merge () { | |
5887ac82 | 86 | cmt="$(cat $dotest/cmt.$1)" |
58634dbf | 87 | echo "$cmt" > "$dotest/current" |
0bb733c9 SP |
88 | hd=$(git-rev-parse --verify HEAD) |
89 | cmt_name=$(git-symbolic-ref HEAD) | |
90 | msgnum=$(cat $dotest/msgnum) | |
91 | end=$(cat $dotest/end) | |
92 | eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' | |
93 | eval GITHEAD_$hd='"$(cat $dotest/onto_name)"' | |
94 | export GITHEAD_$cmt GITHEAD_$hd | |
95 | git-merge-$strategy "$cmt^" -- "$hd" "$cmt" | |
58634dbf EW |
96 | rv=$? |
97 | case "$rv" in | |
98 | 0) | |
0bb733c9 | 99 | unset GITHEAD_$cmt GITHEAD_$hd |
9e4bc7dd | 100 | return |
58634dbf EW |
101 | ;; |
102 | 1) | |
103 | test -d "$GIT_DIR/rr-cache" && git-rerere | |
66eb64cb | 104 | die "$RESOLVEMSG" |
58634dbf EW |
105 | ;; |
106 | 2) | |
107 | echo "Strategy: $rv $strategy failed, try another" 1>&2 | |
66eb64cb | 108 | die "$RESOLVEMSG" |
58634dbf EW |
109 | ;; |
110 | *) | |
111 | die "Unknown exit code ($rv) from command:" \ | |
112 | "git-merge-$strategy $cmt^ -- HEAD $cmt" | |
113 | ;; | |
114 | esac | |
115 | } | |
116 | ||
117 | finish_rb_merge () { | |
58634dbf EW |
118 | rm -r "$dotest" |
119 | echo "All done." | |
120 | } | |
121 | ||
e646c9c8 JH |
122 | while case "$#" in 0) break ;; esac |
123 | do | |
124 | case "$1" in | |
031321c6 SE |
125 | --continue) |
126 | diff=$(git-diff-files) | |
127 | case "$diff" in | |
128 | ?*) echo "You must edit all merge conflicts and then" | |
129 | echo "mark them as resolved using git update-index" | |
130 | exit 1 | |
131 | ;; | |
132 | esac | |
58634dbf EW |
133 | if test -d "$dotest" |
134 | then | |
135 | prev_head="`cat $dotest/prev_head`" | |
136 | end="`cat $dotest/end`" | |
137 | msgnum="`cat $dotest/msgnum`" | |
138 | onto="`cat $dotest/onto`" | |
139 | continue_merge | |
140 | while test "$msgnum" -le "$end" | |
141 | do | |
142 | call_merge "$msgnum" | |
143 | continue_merge | |
144 | done | |
145 | finish_rb_merge | |
146 | exit | |
147 | fi | |
f9474132 | 148 | git am --resolved --3way --resolvemsg="$RESOLVEMSG" |
cc120056 SE |
149 | exit |
150 | ;; | |
151 | --skip) | |
58634dbf EW |
152 | if test -d "$dotest" |
153 | then | |
f131dd49 EW |
154 | if test -d "$GIT_DIR/rr-cache" |
155 | then | |
156 | git-rerere clear | |
157 | fi | |
d5e673b6 EW |
158 | prev_head="`cat $dotest/prev_head`" |
159 | end="`cat $dotest/end`" | |
160 | msgnum="`cat $dotest/msgnum`" | |
161 | msgnum=$(($msgnum + 1)) | |
162 | onto="`cat $dotest/onto`" | |
163 | while test "$msgnum" -le "$end" | |
164 | do | |
165 | call_merge "$msgnum" | |
166 | continue_merge | |
167 | done | |
168 | finish_rb_merge | |
169 | exit | |
58634dbf | 170 | fi |
f9474132 | 171 | git am -3 --skip --resolvemsg="$RESOLVEMSG" |
031321c6 SE |
172 | exit |
173 | ;; | |
174 | --abort) | |
f131dd49 EW |
175 | if test -d "$GIT_DIR/rr-cache" |
176 | then | |
177 | git-rerere clear | |
178 | fi | |
58634dbf EW |
179 | if test -d "$dotest" |
180 | then | |
181 | rm -r "$dotest" | |
182 | elif test -d .dotest | |
183 | then | |
184 | rm -r .dotest | |
185 | else | |
186 | die "No rebase in progress?" | |
187 | fi | |
031321c6 | 188 | git reset --hard ORIG_HEAD |
031321c6 SE |
189 | exit |
190 | ;; | |
e646c9c8 JH |
191 | --onto) |
192 | test 2 -le "$#" || usage | |
193 | newbase="$2" | |
194 | shift | |
195 | ;; | |
58634dbf EW |
196 | -M|-m|--m|--me|--mer|--merg|--merge) |
197 | do_merge=t | |
198 | ;; | |
199 | -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ | |
200 | --strateg=*|--strategy=*|\ | |
201 | -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) | |
202 | case "$#,$1" in | |
203 | *,*=*) | |
8096fae7 | 204 | strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; |
58634dbf EW |
205 | 1,*) |
206 | usage ;; | |
207 | *) | |
208 | strategy="$2" | |
209 | shift ;; | |
210 | esac | |
211 | do_merge=t | |
212 | ;; | |
b758789c RS |
213 | -v|--verbose) |
214 | verbose=t | |
215 | ;; | |
e646c9c8 JH |
216 | -*) |
217 | usage | |
218 | ;; | |
219 | *) | |
220 | break | |
221 | ;; | |
222 | esac | |
223 | shift | |
224 | done | |
2db8aaec | 225 | |
7f4bd5d8 | 226 | # Make sure we do not have .dotest |
58634dbf | 227 | if test -z "$do_merge" |
7f4bd5d8 | 228 | then |
58634dbf EW |
229 | if mkdir .dotest |
230 | then | |
231 | rmdir .dotest | |
232 | else | |
233 | echo >&2 ' | |
7f4bd5d8 JH |
234 | It seems that I cannot create a .dotest directory, and I wonder if you |
235 | are in the middle of patch application or another rebase. If that is not | |
236 | the case, please rm -fr .dotest and run me again. I am stopping in case | |
237 | you still have something valuable there.' | |
58634dbf EW |
238 | exit 1 |
239 | fi | |
240 | else | |
241 | if test -d "$dotest" | |
242 | then | |
243 | die "previous dotest directory $dotest still exists." \ | |
244 | 'try git-rebase < --continue | --abort >' | |
245 | fi | |
7f4bd5d8 JH |
246 | fi |
247 | ||
7f59dbbb | 248 | # The tree must be really really clean. |
215a7ad1 | 249 | git-update-index --refresh || exit |
7f59dbbb | 250 | diff=$(git-diff-index --cached --name-status -r HEAD) |
32d99544 | 251 | case "$diff" in |
7f59dbbb JH |
252 | ?*) echo "$diff" |
253 | exit 1 | |
254 | ;; | |
255 | esac | |
99a92f92 | 256 | |
e646c9c8 JH |
257 | # The upstream head must be given. Make sure it is valid. |
258 | upstream_name="$1" | |
259 | upstream=`git rev-parse --verify "${upstream_name}^0"` || | |
d0080b3c | 260 | die "invalid upstream $upstream_name" |
32d99544 | 261 | |
9a111c91 JH |
262 | # If a hook exists, give it a chance to interrupt |
263 | if test -x "$GIT_DIR/hooks/pre-rebase" | |
264 | then | |
265 | "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || { | |
266 | echo >&2 "The pre-rebase hook refused to rebase." | |
267 | exit 1 | |
268 | } | |
269 | fi | |
270 | ||
7f59dbbb | 271 | # If the branch to rebase is given, first switch to it. |
59e6b23a | 272 | case "$#" in |
7f59dbbb | 273 | 2) |
e646c9c8 | 274 | branch_name="$2" |
3ae39ab2 | 275 | git-checkout "$2" || usage |
e646c9c8 JH |
276 | ;; |
277 | *) | |
bcf31618 JH |
278 | if branch_name=`git symbolic-ref -q HEAD` |
279 | then | |
280 | branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` | |
281 | else | |
282 | branch_name=HEAD ;# detached | |
283 | fi | |
e646c9c8 | 284 | ;; |
59e6b23a | 285 | esac |
e646c9c8 | 286 | branch=$(git-rev-parse --verify "${branch_name}^0") || exit |
59e6b23a | 287 | |
e646c9c8 JH |
288 | # Make sure the branch to rebase onto is valid. |
289 | onto_name=${newbase-"$upstream_name"} | |
290 | onto=$(git-rev-parse --verify "${onto_name}^0") || exit | |
32d99544 | 291 | |
e646c9c8 JH |
292 | # Now we are rebasing commits $upstream..$branch on top of $onto |
293 | ||
294 | # Check if we are already based on $onto, but this should be | |
295 | # done only when upstream and onto are the same. | |
83c31614 RS |
296 | mb=$(git-merge-base "$onto" "$branch") |
297 | if test "$upstream" = "$onto" && test "$mb" = "$onto" | |
7f4bd5d8 | 298 | then |
83c31614 RS |
299 | echo >&2 "Current branch $branch_name is up to date." |
300 | exit 0 | |
7f4bd5d8 JH |
301 | fi |
302 | ||
b758789c RS |
303 | if test -n "$verbose" |
304 | then | |
305 | echo "Changes from $mb to $onto:" | |
306 | git-diff-tree --stat --summary "$mb" "$onto" | |
307 | fi | |
308 | ||
e646c9c8 | 309 | # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD. |
228e2eb6 | 310 | echo "First, rewinding head to replay your work on top of it..." |
e646c9c8 | 311 | git-reset --hard "$onto" |
32d99544 | 312 | |
e646c9c8 | 313 | # If the $onto is a proper descendant of the tip of the branch, then |
32d99544 | 314 | # we just fast forwarded. |
83c31614 | 315 | if test "$mb" = "$branch" |
32d99544 | 316 | then |
d587ed13 | 317 | echo >&2 "Fast-forwarded $branch_name to $onto_name." |
32d99544 LS |
318 | exit 0 |
319 | fi | |
320 | ||
58634dbf EW |
321 | if test -z "$do_merge" |
322 | then | |
91b48977 | 323 | git-format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD | |
f9474132 | 324 | git am --binary -3 -k --resolvemsg="$RESOLVEMSG" |
58634dbf EW |
325 | exit $? |
326 | fi | |
327 | ||
328 | # start doing a rebase with git-merge | |
329 | # this is rename-aware if the recursive (default) strategy is used | |
330 | ||
331 | mkdir -p "$dotest" | |
332 | echo "$onto" > "$dotest/onto" | |
0bb733c9 | 333 | echo "$onto_name" > "$dotest/onto_name" |
58634dbf EW |
334 | prev_head=`git-rev-parse HEAD^0` |
335 | echo "$prev_head" > "$dotest/prev_head" | |
336 | ||
337 | msgnum=0 | |
338 | for cmt in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \ | |
d9bffc08 | 339 | | @@PERL@@ -e 'print reverse <>'` |
58634dbf EW |
340 | do |
341 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 342 | echo "$cmt" > "$dotest/cmt.$msgnum" |
58634dbf EW |
343 | done |
344 | ||
5887ac82 JH |
345 | echo 1 >"$dotest/msgnum" |
346 | echo $msgnum >"$dotest/end" | |
58634dbf EW |
347 | |
348 | end=$msgnum | |
349 | msgnum=1 | |
350 | ||
351 | while test "$msgnum" -le "$end" | |
352 | do | |
353 | call_merge "$msgnum" | |
354 | continue_merge | |
355 | done | |
cc120056 | 356 | |
58634dbf | 357 | finish_rb_merge |