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