]>
Commit | Line | Data |
---|---|---|
1b1dce4b JS |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2006 Johannes E. Schindelin | |
4 | ||
5 | # SHORT DESCRIPTION | |
6 | # | |
7 | # This script makes it easy to fix up commits in the middle of a series, | |
8 | # and rearrange commits. | |
9 | # | |
10 | # The original idea comes from Eric W. Biederman, in | |
11 | # http://article.gmane.org/gmane.comp.version-control.git/22407 | |
12 | ||
1b1dce4b | 13 | . git-sh-setup |
1b1dce4b | 14 | |
80883bb3 MH |
15 | # The file containing rebase commands, comments, and empty lines. |
16 | # This file is created by "git rebase -i" then edited by the user. As | |
17 | # the lines are processed, they are removed from the front of this | |
6bb4e485 | 18 | # file and written to the tail of $done. |
431b7e78 | 19 | todo="$state_dir"/git-rebase-todo |
80883bb3 MH |
20 | |
21 | # The rebase command lines that have already been processed. A line | |
22 | # is moved here when it is first handled, before any associated user | |
23 | # actions. | |
431b7e78 | 24 | done="$state_dir"/done |
80883bb3 MH |
25 | |
26 | # The commit message that is planned to be used for any changes that | |
27 | # need to be committed following a user interaction. | |
431b7e78 | 28 | msg="$state_dir"/message |
80883bb3 MH |
29 | |
30 | # The file into which is accumulated the suggested commit message for | |
31 | # squash/fixup commands. When the first of a series of squash/fixups | |
32 | # is seen, the file is created and the commit message from the | |
33 | # previous commit and from the first squash/fixup commit are written | |
34 | # to it. The commit message for each subsequent squash/fixup commit | |
35 | # is appended to the file as it is processed. | |
36 | # | |
37 | # The first line of the file is of the form | |
6bb4e485 MZ |
38 | # # This is a combination of $count commits. |
39 | # where $count is the number of commits whose messages have been | |
80883bb3 MH |
40 | # written to the file so far (including the initial "pick" commit). |
41 | # Each time that a commit message is processed, this line is read and | |
42 | # updated. It is deleted just before the combined commit is made. | |
431b7e78 | 43 | squash_msg="$state_dir"/message-squash |
80883bb3 | 44 | |
a25eb139 MH |
45 | # If the current series of squash/fixups has not yet included a squash |
46 | # command, then this file exists and holds the commit message of the | |
47 | # original "pick" commit. (If the series ends without a "squash" | |
48 | # command, then this can be used as the commit message of the combined | |
49 | # commit without opening the editor.) | |
431b7e78 | 50 | fixup_msg="$state_dir"/message-fixup |
a25eb139 | 51 | |
6bb4e485 MZ |
52 | # $rewritten is the name of a directory containing files for each |
53 | # commit that is reachable by at least one merge base of $head and | |
54 | # $upstream. They are not necessarily rewritten, but their children | |
80883bb3 MH |
55 | # might be. This ensures that commits on merged, but otherwise |
56 | # unrelated side branches are left alone. (Think "X" in the man page's | |
57 | # example.) | |
431b7e78 | 58 | rewritten="$state_dir"/rewritten |
80883bb3 | 59 | |
431b7e78 | 60 | dropped="$state_dir"/dropped |
0aac0de4 MH |
61 | |
62 | # A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and | |
63 | # GIT_AUTHOR_DATE that will be used for the commit that is currently | |
64 | # being rebased. | |
431b7e78 | 65 | author_script="$state_dir"/author-script |
0aac0de4 | 66 | |
a4049ae7 MH |
67 | # When an "edit" rebase command is being processed, the SHA1 of the |
68 | # commit to be edited is recorded in this file. When "git rebase | |
69 | # --continue" is executed, if there are any staged changes then they | |
70 | # will be amended to the HEAD commit, but only provided the HEAD | |
71 | # commit is still the commit to be edited. When any other rebase | |
72 | # command is processed, this file is deleted. | |
431b7e78 | 73 | amend="$state_dir"/amend |
a4049ae7 | 74 | |
b079feed TR |
75 | # For the post-rewrite hook, we make a list of rewritten commits and |
76 | # their new sha1s. The rewritten-pending list keeps the sha1s of | |
77 | # commits that have been processed, but not committed yet, | |
78 | # e.g. because they are waiting for a 'squash' command. | |
431b7e78 MZ |
79 | rewritten_list="$state_dir"/rewritten-list |
80 | rewritten_pending="$state_dir"/rewritten-pending | |
6bb4e485 | 81 | |
89c7ae9c | 82 | GIT_CHERRY_PICK_HELP="$resolvemsg" |
804c7174 WC |
83 | export GIT_CHERRY_PICK_HELP |
84 | ||
1b1dce4b | 85 | warn () { |
938791cd | 86 | printf '%s\n' "$*" >&2 |
1b1dce4b JS |
87 | } |
88 | ||
ee0a4afb MH |
89 | # Output the commit message for the specified commit. |
90 | commit_message () { | |
91 | git cat-file commit "$1" | sed "1,/^$/d" | |
92 | } | |
93 | ||
6bb4e485 | 94 | orig_reflog_action="$GIT_REFLOG_ACTION" |
1b1dce4b JS |
95 | |
96 | comment_for_reflog () { | |
6bb4e485 | 97 | case "$orig_reflog_action" in |
1b1dce4b JS |
98 | ''|rebase*) |
99 | GIT_REFLOG_ACTION="rebase -i ($1)" | |
100 | export GIT_REFLOG_ACTION | |
376ccb8c | 101 | ;; |
1b1dce4b JS |
102 | esac |
103 | } | |
104 | ||
4e673877 | 105 | last_count= |
1b1dce4b | 106 | mark_action_done () { |
6bb4e485 MZ |
107 | sed -e 1q < "$todo" >> "$done" |
108 | sed -e 1d < "$todo" >> "$todo".new | |
109 | mv -f "$todo".new "$todo" | |
110 | new_count=$(sane_grep -c '^[^#]' < "$done") | |
111 | total=$(($new_count+$(sane_grep -c '^[^#]' < "$todo"))) | |
112 | if test "$last_count" != "$new_count" | |
4e673877 | 113 | then |
6bb4e485 MZ |
114 | last_count=$new_count |
115 | printf "Rebasing (%d/%d)\r" $new_count $total | |
116 | test -z "$verbose" || echo | |
4e673877 | 117 | fi |
1b1dce4b JS |
118 | } |
119 | ||
120 | make_patch () { | |
4fb1a19d JS |
121 | sha1_and_parents="$(git rev-list --parents -1 "$1")" |
122 | case "$sha1_and_parents" in | |
123 | ?*' '?*' '?*) | |
124 | git diff --cc $sha1_and_parents | |
125 | ;; | |
126 | ?*' '?*) | |
127 | git diff-tree -p "$1^!" | |
128 | ;; | |
129 | *) | |
130 | echo "Root commit" | |
131 | ;; | |
431b7e78 | 132 | esac > "$state_dir"/patch |
6bb4e485 MZ |
133 | test -f "$msg" || |
134 | commit_message "$1" > "$msg" | |
135 | test -f "$author_script" || | |
136 | get_author_ident_from_commit "$1" > "$author_script" | |
1b1dce4b JS |
137 | } |
138 | ||
139 | die_with_patch () { | |
431b7e78 | 140 | echo "$1" > "$state_dir"/stopped-sha |
1b1dce4b | 141 | make_patch "$1" |
ecfe72ff | 142 | git rerere |
1b1dce4b JS |
143 | die "$2" |
144 | } | |
145 | ||
c54b7817 | 146 | die_abort () { |
431b7e78 | 147 | rm -rf "$state_dir" |
c54b7817 JS |
148 | die "$1" |
149 | } | |
150 | ||
376ccb8c | 151 | has_action () { |
e1622bfc | 152 | sane_grep '^[^#]' "$1" >/dev/null |
376ccb8c JS |
153 | } |
154 | ||
7756ecff MH |
155 | # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and |
156 | # GIT_AUTHOR_DATE exported from the current environment. | |
157 | do_with_author () { | |
76c9c0db JH |
158 | ( |
159 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE | |
160 | "$@" | |
161 | ) | |
7756ecff MH |
162 | } |
163 | ||
821881d8 PO |
164 | git_sequence_editor () { |
165 | if test -z "$GIT_SEQUENCE_EDITOR" | |
166 | then | |
167 | GIT_SEQUENCE_EDITOR="$(git config sequence.editor)" | |
168 | if [ -z "$GIT_SEQUENCE_EDITOR" ] | |
169 | then | |
170 | GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $? | |
171 | fi | |
172 | fi | |
173 | ||
174 | eval "$GIT_SEQUENCE_EDITOR" '"$@"' | |
175 | } | |
176 | ||
1b1dce4b | 177 | pick_one () { |
8e75abfd CC |
178 | ff=--ff |
179 | case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac | |
6bb4e485 | 180 | case "$force_rebase" in '') ;; ?*) ff= ;; esac |
dfa49f33 | 181 | output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1" |
6bb4e485 | 182 | test -d "$rewritten" && |
f09c9b8c | 183 | pick_one_preserving_merges "$@" && return |
8e75abfd | 184 | output git cherry-pick $ff "$@" |
1b1dce4b JS |
185 | } |
186 | ||
f09c9b8c | 187 | pick_one_preserving_merges () { |
71d9451e TR |
188 | fast_forward=t |
189 | case "$1" in | |
190 | -n) | |
191 | fast_forward=f | |
192 | sha1=$2 | |
193 | ;; | |
194 | *) | |
195 | sha1=$1 | |
196 | ;; | |
197 | esac | |
f09c9b8c JS |
198 | sha1=$(git rev-parse $sha1) |
199 | ||
431b7e78 | 200 | if test -f "$state_dir"/current-commit |
f09c9b8c | 201 | then |
4c1360f4 | 202 | if test "$fast_forward" = t |
bb645071 | 203 | then |
41f556b9 | 204 | while read current_commit |
bb645071 | 205 | do |
6bb4e485 | 206 | git rev-parse HEAD > "$rewritten"/$current_commit |
431b7e78 MZ |
207 | done <"$state_dir"/current-commit |
208 | rm "$state_dir"/current-commit || | |
bb645071 SH |
209 | die "Cannot write current commit's replacement sha1" |
210 | fi | |
f09c9b8c JS |
211 | fi |
212 | ||
431b7e78 | 213 | echo $sha1 >> "$state_dir"/current-commit |
a96dc01e | 214 | |
f09c9b8c | 215 | # rewrite parents; if none were rewritten, we can fast-forward. |
f09c9b8c | 216 | new_parents= |
d911d146 TR |
217 | pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)" |
218 | if test "$pend" = " " | |
219 | then | |
220 | pend=" root" | |
221 | fi | |
faae853c | 222 | while [ "$pend" != "" ] |
f09c9b8c | 223 | do |
faae853c SH |
224 | p=$(expr "$pend" : ' \([^ ]*\)') |
225 | pend="${pend# $p}" | |
226 | ||
6bb4e485 | 227 | if test -f "$rewritten"/$p |
f09c9b8c | 228 | then |
6bb4e485 | 229 | new_p=$(cat "$rewritten"/$p) |
80fe82e4 SH |
230 | |
231 | # If the todo reordered commits, and our parent is marked for | |
232 | # rewriting, but hasn't been gotten to yet, assume the user meant to | |
233 | # drop it on top of the current HEAD | |
234 | if test -z "$new_p" | |
235 | then | |
236 | new_p=$(git rev-parse HEAD) | |
237 | fi | |
238 | ||
f09c9b8c JS |
239 | test $p != $new_p && fast_forward=f |
240 | case "$new_parents" in | |
241 | *$new_p*) | |
242 | ;; # do nothing; that parent is already there | |
243 | *) | |
244 | new_parents="$new_parents $new_p" | |
376ccb8c | 245 | ;; |
f09c9b8c | 246 | esac |
1c5fa0a1 | 247 | else |
6bb4e485 | 248 | if test -f "$dropped"/$p |
faae853c SH |
249 | then |
250 | fast_forward=f | |
6bb4e485 | 251 | replacement="$(cat "$dropped"/$p)" |
d911d146 TR |
252 | test -z "$replacement" && replacement=root |
253 | pend=" $replacement$pend" | |
faae853c SH |
254 | else |
255 | new_parents="$new_parents $p" | |
256 | fi | |
f09c9b8c JS |
257 | fi |
258 | done | |
259 | case $fast_forward in | |
260 | t) | |
a75d7b54 | 261 | output warn "Fast-forward to $sha1" |
71d9451e | 262 | output git reset --hard $sha1 || |
a75d7b54 | 263 | die "Cannot fast-forward to $sha1" |
f09c9b8c JS |
264 | ;; |
265 | f) | |
376ccb8c | 266 | first_parent=$(expr "$new_parents" : ' \([^ ]*\)') |
a4f25e36 SH |
267 | |
268 | if [ "$1" != "-n" ] | |
269 | then | |
270 | # detach HEAD to current parent | |
271 | output git checkout $first_parent 2> /dev/null || | |
272 | die "Cannot move HEAD to $first_parent" | |
273 | fi | |
f09c9b8c | 274 | |
f09c9b8c | 275 | case "$new_parents" in |
376ccb8c | 276 | ' '*' '*) |
a4f25e36 SH |
277 | test "a$1" = a-n && die "Refusing to squash a merge: $sha1" |
278 | ||
f09c9b8c | 279 | # redo merge |
6bb4e485 MZ |
280 | author_script_content=$(get_author_ident_from_commit $sha1) |
281 | eval "$author_script_content" | |
282 | msg_content="$(commit_message $sha1)" | |
f91333d6 BS |
283 | # No point in merging the first parent, that's HEAD |
284 | new_parents=${new_parents# $first_parent} | |
7756ecff | 285 | if ! do_with_author output \ |
9fdc1cc8 | 286 | git merge --no-ff ${strategy:+-s $strategy} -m \ |
9765b6ab | 287 | "$msg_content" $new_parents |
f09c9b8c | 288 | then |
6bb4e485 | 289 | printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG |
f5b49ea6 | 290 | die_with_patch $sha1 "Error redoing merge $sha1" |
f09c9b8c | 291 | fi |
6bb4e485 | 292 | echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list" |
f09c9b8c JS |
293 | ;; |
294 | *) | |
2a9c53e0 | 295 | output git cherry-pick "$@" || |
f09c9b8c | 296 | die_with_patch $sha1 "Could not pick $sha1" |
376ccb8c | 297 | ;; |
f09c9b8c | 298 | esac |
376ccb8c | 299 | ;; |
f09c9b8c JS |
300 | esac |
301 | } | |
302 | ||
6368f3f8 JS |
303 | nth_string () { |
304 | case "$1" in | |
305 | *1[0-9]|*[04-9]) echo "$1"th;; | |
306 | *1) echo "$1"st;; | |
307 | *2) echo "$1"nd;; | |
308 | *3) echo "$1"rd;; | |
309 | esac | |
310 | } | |
311 | ||
a25eb139 | 312 | update_squash_messages () { |
6bb4e485 MZ |
313 | if test -f "$squash_msg"; then |
314 | mv "$squash_msg" "$squash_msg".bak || exit | |
315 | count=$(($(sed -n \ | |
f99e269c | 316 | -e "1s/^# This is a combination of \(.*\) commits\./\1/p" \ |
6bb4e485 | 317 | -e "q" < "$squash_msg".bak)+1)) |
bde1a686 | 318 | { |
6bb4e485 | 319 | echo "# This is a combination of $count commits." |
bde1a686 MH |
320 | sed -e 1d -e '2,/^./{ |
321 | /^$/d | |
6bb4e485 MZ |
322 | }' <"$squash_msg".bak |
323 | } >"$squash_msg" | |
6368f3f8 | 324 | else |
6bb4e485 MZ |
325 | commit_message HEAD > "$fixup_msg" || die "Cannot write $fixup_msg" |
326 | count=2 | |
bde1a686 MH |
327 | { |
328 | echo "# This is a combination of 2 commits." | |
329 | echo "# The first commit's message is:" | |
330 | echo | |
6bb4e485 MZ |
331 | cat "$fixup_msg" |
332 | } >"$squash_msg" | |
6368f3f8 | 333 | fi |
0205e72f MH |
334 | case $1 in |
335 | squash) | |
6bb4e485 | 336 | rm -f "$fixup_msg" |
0205e72f | 337 | echo |
6bb4e485 | 338 | echo "# This is the $(nth_string $count) commit message:" |
0205e72f | 339 | echo |
ee0a4afb | 340 | commit_message $2 |
0205e72f MH |
341 | ;; |
342 | fixup) | |
343 | echo | |
6bb4e485 | 344 | echo "# The $(nth_string $count) commit message will be skipped:" |
0205e72f | 345 | echo |
ee0a4afb | 346 | commit_message $2 | sed -e 's/^/# /' |
0205e72f | 347 | ;; |
6bb4e485 | 348 | esac >>"$squash_msg" |
6368f3f8 JS |
349 | } |
350 | ||
351 | peek_next_command () { | |
6bb4e485 | 352 | sed -n -e "/^#/d" -e '/^$/d' -e "s/ .*//p" -e "q" < "$todo" |
6368f3f8 JS |
353 | } |
354 | ||
6bdcd0d2 MH |
355 | # A squash/fixup has failed. Prepare the long version of the squash |
356 | # commit message, then die_with_patch. This code path requires the | |
357 | # user to edit the combined commit message for all commits that have | |
358 | # been squashed/fixedup so far. So also erase the old squash | |
359 | # messages, effectively causing the combined commit to be used as the | |
360 | # new basis for any further squash/fixups. Args: sha1 rest | |
361 | die_failed_squash() { | |
6bb4e485 MZ |
362 | mv "$squash_msg" "$msg" || exit |
363 | rm -f "$fixup_msg" | |
364 | cp "$msg" "$GIT_DIR"/MERGE_MSG || exit | |
6bdcd0d2 MH |
365 | warn |
366 | warn "Could not apply $1... $2" | |
367 | die_with_patch $1 "" | |
368 | } | |
369 | ||
b079feed | 370 | flush_rewritten_pending() { |
6bb4e485 | 371 | test -s "$rewritten_pending" || return |
b079feed | 372 | newsha1="$(git rev-parse HEAD^0)" |
6bb4e485 MZ |
373 | sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list" |
374 | rm -f "$rewritten_pending" | |
b079feed TR |
375 | } |
376 | ||
377 | record_in_rewritten() { | |
378 | oldsha1="$(git rev-parse $1)" | |
6bb4e485 | 379 | echo "$oldsha1" >> "$rewritten_pending" |
b079feed TR |
380 | |
381 | case "$(peek_next_command)" in | |
41f556b9 | 382 | squash|s|fixup|f) |
b079feed | 383 | ;; |
41f556b9 | 384 | *) |
b079feed TR |
385 | flush_rewritten_pending |
386 | ;; | |
387 | esac | |
388 | } | |
389 | ||
1b1dce4b | 390 | do_next () { |
6bb4e485 MZ |
391 | rm -f "$msg" "$author_script" "$amend" || exit |
392 | read -r command sha1 rest < "$todo" | |
1b1dce4b | 393 | case "$command" in |
ff74126c | 394 | '#'*|''|noop) |
1b1dce4b | 395 | mark_action_done |
1b1dce4b | 396 | ;; |
f8babc4d | 397 | pick|p) |
1b1dce4b JS |
398 | comment_for_reflog pick |
399 | ||
400 | mark_action_done | |
401 | pick_one $sha1 || | |
402 | die_with_patch $sha1 "Could not apply $sha1... $rest" | |
b079feed | 403 | record_in_rewritten $sha1 |
1b1dce4b | 404 | ;; |
6741aa6c BG |
405 | reword|r) |
406 | comment_for_reflog reword | |
407 | ||
408 | mark_action_done | |
409 | pick_one $sha1 || | |
410 | die_with_patch $sha1 "Could not apply $sha1... $rest" | |
6f6bee3b | 411 | git commit --amend --no-post-rewrite |
b079feed | 412 | record_in_rewritten $sha1 |
6741aa6c | 413 | ;; |
f8babc4d | 414 | edit|e) |
1b1dce4b JS |
415 | comment_for_reflog edit |
416 | ||
417 | mark_action_done | |
418 | pick_one $sha1 || | |
419 | die_with_patch $sha1 "Could not apply $sha1... $rest" | |
431b7e78 | 420 | echo "$sha1" > "$state_dir"/stopped-sha |
1b1dce4b | 421 | make_patch $sha1 |
6bb4e485 | 422 | git rev-parse --verify HEAD > "$amend" |
a8ccc204 | 423 | warn "Stopped at $sha1... $rest" |
1b1dce4b JS |
424 | warn "You can amend the commit now, with" |
425 | warn | |
426 | warn " git commit --amend" | |
427 | warn | |
0460fb44 JS |
428 | warn "Once you are satisfied with your changes, run" |
429 | warn | |
430 | warn " git rebase --continue" | |
431 | warn | |
1b1dce4b JS |
432 | exit 0 |
433 | ;; | |
0205e72f MH |
434 | squash|s|fixup|f) |
435 | case "$command" in | |
436 | squash|s) | |
437 | squash_style=squash | |
438 | ;; | |
439 | fixup|f) | |
440 | squash_style=fixup | |
441 | ;; | |
442 | esac | |
443 | comment_for_reflog $squash_style | |
1b1dce4b | 444 | |
6bb4e485 | 445 | test -f "$done" && has_action "$done" || |
0205e72f | 446 | die "Cannot '$squash_style' without a previous commit" |
1b1dce4b JS |
447 | |
448 | mark_action_done | |
a25eb139 | 449 | update_squash_messages $squash_style $sha1 |
6bb4e485 MZ |
450 | author_script_content=$(get_author_ident_from_commit HEAD) |
451 | echo "$author_script_content" > "$author_script" | |
452 | eval "$author_script_content" | |
7c418836 | 453 | output git reset --soft HEAD^ |
6bdcd0d2 | 454 | pick_one -n $sha1 || die_failed_squash $sha1 "$rest" |
6368f3f8 | 455 | case "$(peek_next_command)" in |
0205e72f | 456 | squash|s|fixup|f) |
a25eb139 MH |
457 | # This is an intermediate commit; its message will only be |
458 | # used in case of trouble. So use the long version: | |
6bb4e485 | 459 | do_with_author output git commit --no-verify -F "$squash_msg" || |
6bdcd0d2 | 460 | die_failed_squash $sha1 "$rest" |
376ccb8c | 461 | ;; |
6368f3f8 | 462 | *) |
a25eb139 | 463 | # This is the final command of this squash/fixup group |
6bb4e485 | 464 | if test -f "$fixup_msg" |
a25eb139 | 465 | then |
6bb4e485 | 466 | do_with_author git commit --no-verify -F "$fixup_msg" || |
6bdcd0d2 MH |
467 | die_failed_squash $sha1 "$rest" |
468 | else | |
6bb4e485 | 469 | cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit |
6bdcd0d2 MH |
470 | rm -f "$GIT_DIR"/MERGE_MSG |
471 | do_with_author git commit --no-verify -e || | |
472 | die_failed_squash $sha1 "$rest" | |
a25eb139 | 473 | fi |
6bb4e485 | 474 | rm -f "$squash_msg" "$fixup_msg" |
376ccb8c | 475 | ;; |
6368f3f8 | 476 | esac |
b079feed | 477 | record_in_rewritten $sha1 |
1b1dce4b | 478 | ;; |
cd035b1c | 479 | x|"exec") |
6bb4e485 | 480 | read -r command rest < "$todo" |
cd035b1c MM |
481 | mark_action_done |
482 | printf 'Executing: %s\n' "$rest" | |
483 | # "exec" command doesn't take a sha1 in the todo-list. | |
484 | # => can't just use $sha1 here. | |
431b7e78 | 485 | git rev-parse --verify HEAD > "$state_dir"/stopped-sha |
cd035b1c MM |
486 | ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution |
487 | status=$? | |
1686519a JH |
488 | # Run in subshell because require_clean_work_tree can die. |
489 | dirty=f | |
490 | (require_clean_work_tree "rebase" 2>/dev/null) || dirty=t | |
cd035b1c MM |
491 | if test "$status" -ne 0 |
492 | then | |
493 | warn "Execution failed: $rest" | |
1686519a JH |
494 | test "$dirty" = f || |
495 | warn "and made changes to the index and/or the working tree" | |
496 | ||
cd035b1c MM |
497 | warn "You can fix the problem, and then run" |
498 | warn | |
499 | warn " git rebase --continue" | |
500 | warn | |
501 | exit "$status" | |
1686519a | 502 | elif test "$dirty" = t |
cd035b1c | 503 | then |
1686519a JH |
504 | warn "Execution succeeded: $rest" |
505 | warn "but left changes to the index and/or the working tree" | |
cd035b1c MM |
506 | warn "Commit or stash your changes, and then run" |
507 | warn | |
508 | warn " git rebase --continue" | |
509 | warn | |
510 | exit 1 | |
511 | fi | |
512 | ;; | |
1b1dce4b JS |
513 | *) |
514 | warn "Unknown command: $command $sha1 $rest" | |
f1be316a JK |
515 | if git rev-parse --verify -q "$sha1" >/dev/null |
516 | then | |
6bb4e485 | 517 | die_with_patch $sha1 "Please fix this in the file $todo." |
f1be316a | 518 | else |
6bb4e485 | 519 | die "Please fix this in the file $todo." |
f1be316a | 520 | fi |
376ccb8c | 521 | ;; |
1b1dce4b | 522 | esac |
6bb4e485 | 523 | test -s "$todo" && return |
1b1dce4b | 524 | |
68a163c9 | 525 | comment_for_reflog finish && |
2959c283 | 526 | shortonto=$(git rev-parse --short $onto) && |
6bb4e485 | 527 | newhead=$(git rev-parse HEAD) && |
431b7e78 | 528 | case $head_name in |
73697a0b | 529 | refs/*) |
431b7e78 MZ |
530 | message="$GIT_REFLOG_ACTION: $head_name onto $shortonto" && |
531 | git update-ref -m "$message" $head_name $newhead $orig_head && | |
53f2ffa8 JK |
532 | git symbolic-ref \ |
533 | -m "$GIT_REFLOG_ACTION: returning to $head_name" \ | |
534 | HEAD $head_name | |
73697a0b JS |
535 | ;; |
536 | esac && { | |
431b7e78 | 537 | test ! -f "$state_dir"/verbose || |
2959c283 | 538 | git diff-tree --stat $orig_head..HEAD |
3df0a859 | 539 | } && |
eb2151bb | 540 | { |
6bb4e485 MZ |
541 | test -s "$rewritten_list" && |
542 | git notes copy --for-rewrite=rebase < "$rewritten_list" || | |
eb2151bb TR |
543 | true # we don't care if this copying failed |
544 | } && | |
b079feed | 545 | if test -x "$GIT_DIR"/hooks/post-rewrite && |
6bb4e485 MZ |
546 | test -s "$rewritten_list"; then |
547 | "$GIT_DIR"/hooks/post-rewrite rebase < "$rewritten_list" | |
b079feed TR |
548 | true # we don't care if this hook failed |
549 | fi && | |
431b7e78 | 550 | rm -rf "$state_dir" && |
73697a0b | 551 | git gc --auto && |
431b7e78 | 552 | warn "Successfully rebased and updated $head_name." |
1b1dce4b JS |
553 | |
554 | exit | |
555 | } | |
556 | ||
557 | do_rest () { | |
558 | while : | |
559 | do | |
560 | do_next | |
561 | done | |
1b1dce4b JS |
562 | } |
563 | ||
0e757e30 JS |
564 | # skip picking commits whose parents are unchanged |
565 | skip_unnecessary_picks () { | |
566 | fd=3 | |
2d6ca6ef | 567 | while read -r command rest |
0e757e30 JS |
568 | do |
569 | # fd=3 means we skip the command | |
2d6ca6ef BC |
570 | case "$fd,$command" in |
571 | 3,pick|3,p) | |
6bb4e485 | 572 | # pick a commit whose parent is current $onto -> skip |
14d87298 | 573 | sha1=${rest%% *} |
2d6ca6ef | 574 | case "$(git rev-parse --verify --quiet "$sha1"^)" in |
6bb4e485 MZ |
575 | "$onto"*) |
576 | onto=$sha1 | |
2d6ca6ef BC |
577 | ;; |
578 | *) | |
579 | fd=1 | |
580 | ;; | |
581 | esac | |
0e757e30 | 582 | ;; |
2d6ca6ef | 583 | 3,#*|3,) |
0e757e30 JS |
584 | # copy comments |
585 | ;; | |
586 | *) | |
587 | fd=1 | |
588 | ;; | |
589 | esac | |
d1c3b10f | 590 | printf '%s\n' "$command${rest:+ }$rest" >&$fd |
6bb4e485 MZ |
591 | done <"$todo" >"$todo.new" 3>>"$done" && |
592 | mv -f "$todo".new "$todo" && | |
b079feed TR |
593 | case "$(peek_next_command)" in |
594 | squash|s|fixup|f) | |
6bb4e485 | 595 | record_in_rewritten "$onto" |
b079feed TR |
596 | ;; |
597 | esac || | |
0e757e30 JS |
598 | die "Could not skip unnecessary pick commands" |
599 | } | |
600 | ||
f59baa50 NS |
601 | # Rearrange the todo list that has both "pick sha1 msg" and |
602 | # "pick sha1 fixup!/squash! msg" appears in it so that the latter | |
603 | # comes immediately after the former, and change "pick" to | |
604 | # "fixup"/"squash". | |
605 | rearrange_squash () { | |
68d5d03b KB |
606 | # extract fixup!/squash! lines and resolve any referenced sha1's |
607 | while read -r pick sha1 message | |
608 | do | |
609 | case "$message" in | |
610 | "squash! "*|"fixup! "*) | |
611 | action="${message%%!*}" | |
612 | rest="${message#*! }" | |
613 | echo "$sha1 $action $rest" | |
614 | # if it's a single word, try to resolve to a full sha1 and | |
615 | # emit a second copy. This allows us to match on both message | |
616 | # and on sha1 prefix | |
617 | if test "${rest#* }" = "$rest"; then | |
618 | fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)" | |
619 | if test -n "$fullsha"; then | |
620 | # prefix the action to uniquely identify this line as | |
621 | # intended for full sha1 match | |
622 | echo "$sha1 +$action $fullsha" | |
623 | fi | |
624 | fi | |
625 | esac | |
626 | done >"$1.sq" <"$1" | |
f59baa50 NS |
627 | test -s "$1.sq" || return |
628 | ||
629 | used= | |
57f2b6b2 | 630 | while read -r pick sha1 message |
f59baa50 NS |
631 | do |
632 | case " $used" in | |
633 | *" $sha1 "*) continue ;; | |
634 | esac | |
938791cd | 635 | printf '%s\n' "$pick $sha1 $message" |
d3d7a421 | 636 | used="$used$sha1 " |
6bb4e485 | 637 | while read -r squash action msg_content |
f59baa50 | 638 | do |
d3d7a421 KB |
639 | case " $used" in |
640 | *" $squash "*) continue ;; | |
641 | esac | |
68d5d03b KB |
642 | emit=0 |
643 | case "$action" in | |
644 | +*) | |
645 | action="${action#+}" | |
646 | # full sha1 prefix test | |
6bb4e485 | 647 | case "$msg_content" in "$sha1"*) emit=1;; esac ;; |
68d5d03b KB |
648 | *) |
649 | # message prefix test | |
6bb4e485 | 650 | case "$message" in "$msg_content"*) emit=1;; esac ;; |
68d5d03b KB |
651 | esac |
652 | if test $emit = 1; then | |
6bb4e485 | 653 | printf '%s\n' "$action $squash $action! $msg_content" |
f59baa50 | 654 | used="$used$squash " |
68d5d03b | 655 | fi |
f59baa50 NS |
656 | done <"$1.sq" |
657 | done >"$1.rearranged" <"$1" | |
658 | cat "$1.rearranged" >"$1" | |
659 | rm -f "$1.sq" "$1.rearranged" | |
660 | } | |
661 | ||
cf432ca0 MZ |
662 | case "$action" in |
663 | continue) | |
cf432ca0 MZ |
664 | # do we have anything to commit? |
665 | if git diff-index --cached --quiet --ignore-submodules HEAD -- | |
666 | then | |
667 | : Nothing to commit -- skip this | |
668 | else | |
ffaaed88 MM |
669 | if ! test -f "$author_script" |
670 | then | |
671 | die "You have staged changes in your working tree. If these changes are meant to be | |
672 | squashed into the previous commit, run: | |
673 | ||
674 | git commit --amend | |
675 | ||
676 | If they are meant to go into a new commit, run: | |
677 | ||
678 | git commit | |
679 | ||
680 | In both case, once you're done, continue with: | |
681 | ||
682 | git rebase --continue | |
683 | " | |
684 | fi | |
cf432ca0 | 685 | . "$author_script" || |
ffaaed88 | 686 | die "Error trying to find the author identity to amend commit" |
cf432ca0 MZ |
687 | current_head= |
688 | if test -f "$amend" | |
03270628 | 689 | then |
cf432ca0 MZ |
690 | current_head=$(git rev-parse --verify HEAD) |
691 | test "$current_head" = $(cat "$amend") || | |
692 | die "\ | |
c14c3c82 DP |
693 | You have uncommitted changes in your working tree. Please, commit them |
694 | first and then run 'git rebase --continue' again." | |
cf432ca0 MZ |
695 | git reset --soft HEAD^ || |
696 | die "Cannot rewind the HEAD" | |
03270628 | 697 | fi |
cf432ca0 MZ |
698 | do_with_author git commit --no-verify -F "$msg" -e || { |
699 | test -n "$current_head" && git reset --soft $current_head | |
700 | die "Could not commit staged changes." | |
701 | } | |
702 | fi | |
18640d99 | 703 | |
431b7e78 | 704 | record_in_rewritten "$(cat "$state_dir"/stopped-sha)" |
0acb62f2 | 705 | |
cf432ca0 MZ |
706 | require_clean_work_tree "rebase" |
707 | do_rest | |
708 | ;; | |
cf432ca0 | 709 | skip) |
cf432ca0 | 710 | git rerere clear |
cf432ca0 | 711 | |
2959c283 | 712 | do_rest |
cf432ca0 MZ |
713 | ;; |
714 | esac | |
1b1dce4b | 715 | |
34262322 MZ |
716 | git var GIT_COMMITTER_IDENT >/dev/null || |
717 | die "You need to set your committer info first" | |
1b1dce4b | 718 | |
34262322 MZ |
719 | comment_for_reflog start |
720 | ||
71786f54 | 721 | if test ! -z "$switch_to" |
34262322 | 722 | then |
71786f54 MZ |
723 | output git checkout "$switch_to" -- || |
724 | die "Could not checkout $switch_to" | |
34262322 MZ |
725 | fi |
726 | ||
431b7e78 MZ |
727 | orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?" |
728 | mkdir "$state_dir" || die "Could not create temporary $state_dir" | |
34262322 | 729 | |
431b7e78 | 730 | : > "$state_dir"/interactive || die "Could not mark as interactive" |
84df4560 | 731 | write_basic_state |
6bb4e485 | 732 | if test t = "$preserve_merges" |
34262322 | 733 | then |
6bb4e485 | 734 | if test -z "$rebase_root" |
34262322 | 735 | then |
6bb4e485 | 736 | mkdir "$rewritten" && |
431b7e78 | 737 | for c in $(git merge-base --all $orig_head $upstream) |
acc8559a | 738 | do |
6bb4e485 | 739 | echo $onto > "$rewritten"/$c || |
34262322 | 740 | die "Could not init rewritten commits" |
acc8559a | 741 | done |
34262322 | 742 | else |
6bb4e485 MZ |
743 | mkdir "$rewritten" && |
744 | echo $onto > "$rewritten"/root || | |
34262322 MZ |
745 | die "Could not init rewritten commits" |
746 | fi | |
747 | # No cherry-pick because our first pass is to determine | |
748 | # parents to rewrite and skipping dropped commits would | |
749 | # prematurely end our probe | |
6bb4e485 | 750 | merges_option= |
34262322 | 751 | else |
6bb4e485 | 752 | merges_option="--no-merges --cherry-pick" |
34262322 MZ |
753 | fi |
754 | ||
431b7e78 | 755 | shorthead=$(git rev-parse --short $orig_head) |
6bb4e485 MZ |
756 | shortonto=$(git rev-parse --short $onto) |
757 | if test -z "$rebase_root" | |
758 | # this is now equivalent to ! -z "$upstream" | |
34262322 | 759 | then |
6bb4e485 | 760 | shortupstream=$(git rev-parse --short $upstream) |
431b7e78 | 761 | revisions=$upstream...$orig_head |
6bb4e485 | 762 | shortrevisions=$shortupstream..$shorthead |
34262322 | 763 | else |
431b7e78 | 764 | revisions=$onto...$orig_head |
6bb4e485 | 765 | shortrevisions=$shorthead |
34262322 | 766 | fi |
6bb4e485 | 767 | git rev-list $merges_option --pretty=oneline --abbrev-commit \ |
34262322 | 768 | --abbrev=7 --reverse --left-right --topo-order \ |
6bb4e485 | 769 | $revisions | \ |
34262322 MZ |
770 | sed -n "s/^>//p" | |
771 | while read -r shortsha1 rest | |
772 | do | |
6bb4e485 | 773 | if test t != "$preserve_merges" |
34262322 | 774 | then |
6bb4e485 | 775 | printf '%s\n' "pick $shortsha1 $rest" >> "$todo" |
34262322 MZ |
776 | else |
777 | sha1=$(git rev-parse $shortsha1) | |
6bb4e485 | 778 | if test -z "$rebase_root" |
acc8559a | 779 | then |
34262322 MZ |
780 | preserve=t |
781 | for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-) | |
acc8559a | 782 | do |
12bf8283 | 783 | if test -f "$rewritten"/$p |
acc8559a | 784 | then |
34262322 | 785 | preserve=f |
acc8559a SH |
786 | fi |
787 | done | |
34262322 MZ |
788 | else |
789 | preserve=f | |
790 | fi | |
791 | if test f = "$preserve" | |
792 | then | |
6bb4e485 MZ |
793 | touch "$rewritten"/$sha1 |
794 | printf '%s\n' "pick $shortsha1 $rest" >> "$todo" | |
acc8559a | 795 | fi |
34262322 MZ |
796 | fi |
797 | done | |
d911d146 | 798 | |
34262322 | 799 | # Watch for commits that been dropped by --cherry-pick |
6bb4e485 | 800 | if test t = "$preserve_merges" |
34262322 | 801 | then |
6bb4e485 | 802 | mkdir "$dropped" |
34262322 | 803 | # Save all non-cherry-picked changes |
6bb4e485 | 804 | git rev-list $revisions --left-right --cherry-pick | \ |
431b7e78 | 805 | sed -n "s/^>//p" > "$state_dir"/not-cherry-picks |
34262322 MZ |
806 | # Now all commits and note which ones are missing in |
807 | # not-cherry-picks and hence being dropped | |
6bb4e485 | 808 | git rev-list $revisions | |
34262322 MZ |
809 | while read rev |
810 | do | |
431b7e78 | 811 | if test -f "$rewritten"/$rev -a "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = "" |
34262322 MZ |
812 | then |
813 | # Use -f2 because if rev-list is telling us this commit is | |
814 | # not worthwhile, we don't want to track its multiple heads, | |
815 | # just the history of its first-parent for others that will | |
816 | # be rebasing on top of it | |
6bb4e485 | 817 | git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$dropped"/$rev |
34262322 | 818 | short=$(git rev-list -1 --abbrev-commit --abbrev=7 $rev) |
6bb4e485 MZ |
819 | sane_grep -v "^[a-z][a-z]* $short" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo" |
820 | rm "$rewritten"/$rev | |
34262322 MZ |
821 | fi |
822 | done | |
823 | fi | |
824 | ||
6bb4e485 MZ |
825 | test -s "$todo" || echo noop >> "$todo" |
826 | test -n "$autosquash" && rearrange_squash "$todo" | |
827 | cat >> "$todo" << EOF | |
6047a234 | 828 | |
6bb4e485 | 829 | # Rebase $shortrevisions onto $shortonto |
1b1dce4b JS |
830 | # |
831 | # Commands: | |
88b1f0b8 | 832 | # p, pick = use commit |
6741aa6c | 833 | # r, reword = use commit, but edit the commit message |
88b1f0b8 MV |
834 | # e, edit = use commit, but stop for amending |
835 | # s, squash = use commit, but meld into previous commit | |
0205e72f | 836 | # f, fixup = like "squash", but discard this commit's log message |
960ac5ff | 837 | # x, exec = run command (the rest of the line) using shell |
82576ddb JS |
838 | # |
839 | # If you remove a line here THAT COMMIT WILL BE LOST. | |
6047a234 | 840 | # However, if you remove everything, the rebase will be aborted. |
82576ddb | 841 | # |
1b1dce4b | 842 | EOF |
1b1dce4b | 843 | |
6bb4e485 | 844 | has_action "$todo" || |
34262322 | 845 | die_abort "Nothing to do" |
1b1dce4b | 846 | |
6bb4e485 | 847 | cp "$todo" "$todo".backup |
821881d8 | 848 | git_sequence_editor "$todo" || |
34262322 | 849 | die_abort "Could not execute editor" |
1b1dce4b | 850 | |
6bb4e485 | 851 | has_action "$todo" || |
34262322 | 852 | die_abort "Nothing to do" |
c54b7817 | 853 | |
6bb4e485 | 854 | test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks |
0e757e30 | 855 | |
6bb4e485 | 856 | output git checkout $onto || die_abort "could not detach HEAD" |
431b7e78 | 857 | git update-ref ORIG_HEAD $orig_head |
34262322 | 858 | do_rest |