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