]>
Commit | Line | Data |
---|---|---|
11d62145 JN |
1 | # This shell script fragment is sourced by git-rebase to implement |
2 | # its interactive mode. "git rebase --interactive" makes it easy | |
3 | # to fix up commits in the middle of a series and rearrange commits. | |
1b1dce4b JS |
4 | # |
5 | # Copyright (c) 2006 Johannes E. Schindelin | |
1b1dce4b JS |
6 | # |
7 | # The original idea comes from Eric W. Biederman, in | |
8 | # http://article.gmane.org/gmane.comp.version-control.git/22407 | |
572a7c52 | 9 | # |
80883bb3 MH |
10 | # The file containing rebase commands, comments, and empty lines. |
11 | # This file is created by "git rebase -i" then edited by the user. As | |
12 | # the lines are processed, they are removed from the front of this | |
6bb4e485 | 13 | # file and written to the tail of $done. |
431b7e78 | 14 | todo="$state_dir"/git-rebase-todo |
80883bb3 MH |
15 | |
16 | # The rebase command lines that have already been processed. A line | |
17 | # is moved here when it is first handled, before any associated user | |
18 | # actions. | |
431b7e78 | 19 | done="$state_dir"/done |
80883bb3 MH |
20 | |
21 | # The commit message that is planned to be used for any changes that | |
22 | # need to be committed following a user interaction. | |
431b7e78 | 23 | msg="$state_dir"/message |
80883bb3 MH |
24 | |
25 | # The file into which is accumulated the suggested commit message for | |
26 | # squash/fixup commands. When the first of a series of squash/fixups | |
27 | # is seen, the file is created and the commit message from the | |
28 | # previous commit and from the first squash/fixup commit are written | |
29 | # to it. The commit message for each subsequent squash/fixup commit | |
30 | # is appended to the file as it is processed. | |
31 | # | |
32 | # The first line of the file is of the form | |
6bb4e485 MZ |
33 | # # This is a combination of $count commits. |
34 | # where $count is the number of commits whose messages have been | |
80883bb3 MH |
35 | # written to the file so far (including the initial "pick" commit). |
36 | # Each time that a commit message is processed, this line is read and | |
37 | # updated. It is deleted just before the combined commit is made. | |
431b7e78 | 38 | squash_msg="$state_dir"/message-squash |
80883bb3 | 39 | |
a25eb139 MH |
40 | # If the current series of squash/fixups has not yet included a squash |
41 | # command, then this file exists and holds the commit message of the | |
42 | # original "pick" commit. (If the series ends without a "squash" | |
43 | # command, then this can be used as the commit message of the combined | |
44 | # commit without opening the editor.) | |
431b7e78 | 45 | fixup_msg="$state_dir"/message-fixup |
a25eb139 | 46 | |
6bb4e485 MZ |
47 | # $rewritten is the name of a directory containing files for each |
48 | # commit that is reachable by at least one merge base of $head and | |
49 | # $upstream. They are not necessarily rewritten, but their children | |
80883bb3 MH |
50 | # might be. This ensures that commits on merged, but otherwise |
51 | # unrelated side branches are left alone. (Think "X" in the man page's | |
52 | # example.) | |
431b7e78 | 53 | rewritten="$state_dir"/rewritten |
80883bb3 | 54 | |
431b7e78 | 55 | dropped="$state_dir"/dropped |
0aac0de4 | 56 | |
b71dc3e1 ZK |
57 | end="$state_dir"/end |
58 | msgnum="$state_dir"/msgnum | |
59 | ||
0aac0de4 MH |
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 | |
39743cf5 JH |
80 | # Work around Git for Windows' Bash whose "read" does not strip CRLF |
81 | # and leaves CR at the end instead. | |
82 | cr=$(printf "\015") | |
83 | ||
040fd39e FR |
84 | strategy_args=${strategy:+--strategy=$strategy} |
85 | eval ' | |
86 | for strategy_opt in '"$strategy_opts"' | |
87 | do | |
88 | strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")" | |
89 | done | |
90 | ' | |
db2b3b82 | 91 | |
89c7ae9c | 92 | GIT_CHERRY_PICK_HELP="$resolvemsg" |
804c7174 WC |
93 | export GIT_CHERRY_PICK_HELP |
94 | ||
180bad3d JK |
95 | comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) |
96 | : ${comment_char:=#} | |
97 | ||
1b1dce4b | 98 | warn () { |
938791cd | 99 | printf '%s\n' "$*" >&2 |
1b1dce4b JS |
100 | } |
101 | ||
ee0a4afb MH |
102 | # Output the commit message for the specified commit. |
103 | commit_message () { | |
104 | git cat-file commit "$1" | sed "1,/^$/d" | |
105 | } | |
106 | ||
6bb4e485 | 107 | orig_reflog_action="$GIT_REFLOG_ACTION" |
1b1dce4b JS |
108 | |
109 | comment_for_reflog () { | |
6bb4e485 | 110 | case "$orig_reflog_action" in |
1b1dce4b JS |
111 | ''|rebase*) |
112 | GIT_REFLOG_ACTION="rebase -i ($1)" | |
113 | export GIT_REFLOG_ACTION | |
376ccb8c | 114 | ;; |
1b1dce4b JS |
115 | esac |
116 | } | |
117 | ||
4e673877 | 118 | last_count= |
1b1dce4b | 119 | mark_action_done () { |
6bb4e485 MZ |
120 | sed -e 1q < "$todo" >> "$done" |
121 | sed -e 1d < "$todo" >> "$todo".new | |
122 | mv -f "$todo".new "$todo" | |
180bad3d | 123 | new_count=$(git stripspace --strip-comments <"$done" | wc -l) |
b71dc3e1 | 124 | echo $new_count >"$msgnum" |
180bad3d | 125 | total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l))) |
b71dc3e1 | 126 | echo $total >"$end" |
6bb4e485 | 127 | if test "$last_count" != "$new_count" |
4e673877 | 128 | then |
6bb4e485 MZ |
129 | last_count=$new_count |
130 | printf "Rebasing (%d/%d)\r" $new_count $total | |
131 | test -z "$verbose" || echo | |
4e673877 | 132 | fi |
1b1dce4b JS |
133 | } |
134 | ||
8cbc57ca PH |
135 | # Put the last action marked done at the beginning of the todo list |
136 | # again. If there has not been an action marked done yet, leave the list of | |
137 | # items on the todo list unchanged. | |
138 | reschedule_last_action () { | |
139 | tail -n 1 "$done" | cat - "$todo" >"$todo".new | |
140 | sed -e \$d <"$done" >"$done".new | |
141 | mv -f "$todo".new "$todo" | |
142 | mv -f "$done".new "$done" | |
143 | } | |
144 | ||
fcc5ef1c | 145 | append_todo_help () { |
180bad3d JK |
146 | git stripspace --comment-lines >>"$todo" <<\EOF |
147 | ||
148 | Commands: | |
149 | p, pick = use commit | |
150 | r, reword = use commit, but edit the commit message | |
151 | e, edit = use commit, but stop for amending | |
152 | s, squash = use commit, but meld into previous commit | |
153 | f, fixup = like "squash", but discard this commit's log message | |
154 | x, exec = run command (the rest of the line) using shell | |
c9266d58 | 155 | d, drop = remove commit |
180bad3d JK |
156 | |
157 | These lines can be re-ordered; they are executed from top to bottom. | |
158 | ||
37079959 GR |
159 | EOF |
160 | if test $(get_missing_commit_check_level) = error | |
161 | then | |
162 | git stripspace --comment-lines >>"$todo" <<\EOF | |
163 | Do not remove any line. Use 'drop' explicitly to remove a commit. | |
164 | EOF | |
165 | else | |
166 | git stripspace --comment-lines >>"$todo" <<\EOF | |
180bad3d | 167 | If you remove a line here THAT COMMIT WILL BE LOST. |
fcc5ef1c | 168 | EOF |
37079959 | 169 | fi |
fcc5ef1c AW |
170 | } |
171 | ||
1b1dce4b | 172 | make_patch () { |
4fb1a19d JS |
173 | sha1_and_parents="$(git rev-list --parents -1 "$1")" |
174 | case "$sha1_and_parents" in | |
175 | ?*' '?*' '?*) | |
176 | git diff --cc $sha1_and_parents | |
177 | ;; | |
178 | ?*' '?*) | |
179 | git diff-tree -p "$1^!" | |
180 | ;; | |
181 | *) | |
182 | echo "Root commit" | |
183 | ;; | |
431b7e78 | 184 | esac > "$state_dir"/patch |
6bb4e485 MZ |
185 | test -f "$msg" || |
186 | commit_message "$1" > "$msg" | |
187 | test -f "$author_script" || | |
188 | get_author_ident_from_commit "$1" > "$author_script" | |
1b1dce4b JS |
189 | } |
190 | ||
191 | die_with_patch () { | |
431b7e78 | 192 | echo "$1" > "$state_dir"/stopped-sha |
1b1dce4b | 193 | make_patch "$1" |
ecfe72ff | 194 | git rerere |
1b1dce4b JS |
195 | die "$2" |
196 | } | |
197 | ||
0becb3e4 AW |
198 | exit_with_patch () { |
199 | echo "$1" > "$state_dir"/stopped-sha | |
200 | make_patch $1 | |
201 | git rev-parse --verify HEAD > "$amend" | |
3ee5e540 | 202 | gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} |
0becb3e4 AW |
203 | warn "You can amend the commit now, with" |
204 | warn | |
3ee5e540 | 205 | warn " git commit --amend $gpg_sign_opt_quoted" |
0becb3e4 AW |
206 | warn |
207 | warn "Once you are satisfied with your changes, run" | |
208 | warn | |
209 | warn " git rebase --continue" | |
210 | warn | |
211 | exit $2 | |
212 | } | |
213 | ||
c54b7817 | 214 | die_abort () { |
431b7e78 | 215 | rm -rf "$state_dir" |
c54b7817 JS |
216 | die "$1" |
217 | } | |
218 | ||
376ccb8c | 219 | has_action () { |
180bad3d | 220 | test -n "$(git stripspace --strip-comments <"$1")" |
376ccb8c JS |
221 | } |
222 | ||
90e1818f NH |
223 | is_empty_commit() { |
224 | tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null || | |
225 | die "$1: not a commit that can be picked") | |
226 | ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null || | |
227 | ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904) | |
228 | test "$tree" = "$ptree" | |
229 | } | |
230 | ||
98697784 PH |
231 | is_merge_commit() |
232 | { | |
233 | git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1 | |
234 | } | |
235 | ||
7756ecff MH |
236 | # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and |
237 | # GIT_AUTHOR_DATE exported from the current environment. | |
238 | do_with_author () { | |
76c9c0db JH |
239 | ( |
240 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE | |
241 | "$@" | |
242 | ) | |
7756ecff MH |
243 | } |
244 | ||
821881d8 PO |
245 | git_sequence_editor () { |
246 | if test -z "$GIT_SEQUENCE_EDITOR" | |
247 | then | |
248 | GIT_SEQUENCE_EDITOR="$(git config sequence.editor)" | |
249 | if [ -z "$GIT_SEQUENCE_EDITOR" ] | |
250 | then | |
251 | GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $? | |
252 | fi | |
253 | fi | |
254 | ||
255 | eval "$GIT_SEQUENCE_EDITOR" '"$@"' | |
256 | } | |
257 | ||
1b1dce4b | 258 | pick_one () { |
8e75abfd | 259 | ff=--ff |
90e1818f | 260 | |
8e75abfd | 261 | case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac |
6bb4e485 | 262 | case "$force_rebase" in '') ;; ?*) ff= ;; esac |
dfa49f33 | 263 | output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1" |
90e1818f NH |
264 | |
265 | if is_empty_commit "$sha1" | |
266 | then | |
267 | empty_args="--allow-empty" | |
268 | fi | |
269 | ||
6bb4e485 | 270 | test -d "$rewritten" && |
f09c9b8c | 271 | pick_one_preserving_merges "$@" && return |
3ee5e540 NV |
272 | output eval git cherry-pick \ |
273 | ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \ | |
274 | "$strategy_args" $empty_args $ff "$@" | |
8cbc57ca PH |
275 | |
276 | # If cherry-pick dies it leaves the to-be-picked commit unrecorded. Reschedule | |
277 | # previous task so this commit is not lost. | |
278 | ret=$? | |
279 | case "$ret" in [01]) ;; *) reschedule_last_action ;; esac | |
280 | return $ret | |
1b1dce4b JS |
281 | } |
282 | ||
f09c9b8c | 283 | pick_one_preserving_merges () { |
71d9451e TR |
284 | fast_forward=t |
285 | case "$1" in | |
286 | -n) | |
287 | fast_forward=f | |
288 | sha1=$2 | |
289 | ;; | |
290 | *) | |
291 | sha1=$1 | |
292 | ;; | |
293 | esac | |
f09c9b8c JS |
294 | sha1=$(git rev-parse $sha1) |
295 | ||
431b7e78 | 296 | if test -f "$state_dir"/current-commit |
f09c9b8c | 297 | then |
4c1360f4 | 298 | if test "$fast_forward" = t |
bb645071 | 299 | then |
41f556b9 | 300 | while read current_commit |
bb645071 | 301 | do |
6bb4e485 | 302 | git rev-parse HEAD > "$rewritten"/$current_commit |
431b7e78 MZ |
303 | done <"$state_dir"/current-commit |
304 | rm "$state_dir"/current-commit || | |
bb645071 SH |
305 | die "Cannot write current commit's replacement sha1" |
306 | fi | |
f09c9b8c JS |
307 | fi |
308 | ||
431b7e78 | 309 | echo $sha1 >> "$state_dir"/current-commit |
a96dc01e | 310 | |
f09c9b8c | 311 | # rewrite parents; if none were rewritten, we can fast-forward. |
f09c9b8c | 312 | new_parents= |
d911d146 TR |
313 | pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)" |
314 | if test "$pend" = " " | |
315 | then | |
316 | pend=" root" | |
317 | fi | |
faae853c | 318 | while [ "$pend" != "" ] |
f09c9b8c | 319 | do |
faae853c SH |
320 | p=$(expr "$pend" : ' \([^ ]*\)') |
321 | pend="${pend# $p}" | |
322 | ||
6bb4e485 | 323 | if test -f "$rewritten"/$p |
f09c9b8c | 324 | then |
6bb4e485 | 325 | new_p=$(cat "$rewritten"/$p) |
80fe82e4 SH |
326 | |
327 | # If the todo reordered commits, and our parent is marked for | |
328 | # rewriting, but hasn't been gotten to yet, assume the user meant to | |
329 | # drop it on top of the current HEAD | |
330 | if test -z "$new_p" | |
331 | then | |
332 | new_p=$(git rev-parse HEAD) | |
333 | fi | |
334 | ||
f09c9b8c JS |
335 | test $p != $new_p && fast_forward=f |
336 | case "$new_parents" in | |
337 | *$new_p*) | |
338 | ;; # do nothing; that parent is already there | |
339 | *) | |
340 | new_parents="$new_parents $new_p" | |
376ccb8c | 341 | ;; |
f09c9b8c | 342 | esac |
1c5fa0a1 | 343 | else |
6bb4e485 | 344 | if test -f "$dropped"/$p |
faae853c SH |
345 | then |
346 | fast_forward=f | |
6bb4e485 | 347 | replacement="$(cat "$dropped"/$p)" |
d911d146 TR |
348 | test -z "$replacement" && replacement=root |
349 | pend=" $replacement$pend" | |
faae853c SH |
350 | else |
351 | new_parents="$new_parents $p" | |
352 | fi | |
f09c9b8c JS |
353 | fi |
354 | done | |
355 | case $fast_forward in | |
356 | t) | |
a75d7b54 | 357 | output warn "Fast-forward to $sha1" |
71d9451e | 358 | output git reset --hard $sha1 || |
a75d7b54 | 359 | die "Cannot fast-forward to $sha1" |
f09c9b8c JS |
360 | ;; |
361 | f) | |
376ccb8c | 362 | first_parent=$(expr "$new_parents" : ' \([^ ]*\)') |
a4f25e36 SH |
363 | |
364 | if [ "$1" != "-n" ] | |
365 | then | |
366 | # detach HEAD to current parent | |
367 | output git checkout $first_parent 2> /dev/null || | |
368 | die "Cannot move HEAD to $first_parent" | |
369 | fi | |
f09c9b8c | 370 | |
f09c9b8c | 371 | case "$new_parents" in |
376ccb8c | 372 | ' '*' '*) |
a4f25e36 SH |
373 | test "a$1" = a-n && die "Refusing to squash a merge: $sha1" |
374 | ||
f09c9b8c | 375 | # redo merge |
6bb4e485 MZ |
376 | author_script_content=$(get_author_ident_from_commit $sha1) |
377 | eval "$author_script_content" | |
378 | msg_content="$(commit_message $sha1)" | |
f91333d6 BS |
379 | # No point in merging the first parent, that's HEAD |
380 | new_parents=${new_parents# $first_parent} | |
a9f739c1 | 381 | merge_args="--no-log --no-ff" |
db2b3b82 | 382 | if ! do_with_author output eval \ |
3ee5e540 NV |
383 | 'git merge ${gpg_sign_opt:+"$gpg_sign_opt"} \ |
384 | $merge_args $strategy_args -m "$msg_content" $new_parents' | |
f09c9b8c | 385 | then |
6bb4e485 | 386 | printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG |
f5b49ea6 | 387 | die_with_patch $sha1 "Error redoing merge $sha1" |
f09c9b8c | 388 | fi |
6bb4e485 | 389 | echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list" |
f09c9b8c JS |
390 | ;; |
391 | *) | |
3ee5e540 NV |
392 | output eval git cherry-pick \ |
393 | ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \ | |
394 | "$strategy_args" "$@" || | |
f09c9b8c | 395 | die_with_patch $sha1 "Could not pick $sha1" |
376ccb8c | 396 | ;; |
f09c9b8c | 397 | esac |
376ccb8c | 398 | ;; |
f09c9b8c JS |
399 | esac |
400 | } | |
401 | ||
6368f3f8 JS |
402 | nth_string () { |
403 | case "$1" in | |
404 | *1[0-9]|*[04-9]) echo "$1"th;; | |
405 | *1) echo "$1"st;; | |
406 | *2) echo "$1"nd;; | |
407 | *3) echo "$1"rd;; | |
408 | esac | |
409 | } | |
410 | ||
a25eb139 | 411 | update_squash_messages () { |
6bb4e485 MZ |
412 | if test -f "$squash_msg"; then |
413 | mv "$squash_msg" "$squash_msg".bak || exit | |
414 | count=$(($(sed -n \ | |
180bad3d | 415 | -e "1s/^. This is a combination of \(.*\) commits\./\1/p" \ |
6bb4e485 | 416 | -e "q" < "$squash_msg".bak)+1)) |
bde1a686 | 417 | { |
180bad3d | 418 | printf '%s\n' "$comment_char This is a combination of $count commits." |
bde1a686 MH |
419 | sed -e 1d -e '2,/^./{ |
420 | /^$/d | |
6bb4e485 MZ |
421 | }' <"$squash_msg".bak |
422 | } >"$squash_msg" | |
6368f3f8 | 423 | else |
6bb4e485 MZ |
424 | commit_message HEAD > "$fixup_msg" || die "Cannot write $fixup_msg" |
425 | count=2 | |
bde1a686 | 426 | { |
180bad3d JK |
427 | printf '%s\n' "$comment_char This is a combination of 2 commits." |
428 | printf '%s\n' "$comment_char The first commit's message is:" | |
bde1a686 | 429 | echo |
6bb4e485 MZ |
430 | cat "$fixup_msg" |
431 | } >"$squash_msg" | |
6368f3f8 | 432 | fi |
0205e72f MH |
433 | case $1 in |
434 | squash) | |
6bb4e485 | 435 | rm -f "$fixup_msg" |
0205e72f | 436 | echo |
180bad3d | 437 | printf '%s\n' "$comment_char This is the $(nth_string $count) commit message:" |
0205e72f | 438 | echo |
ee0a4afb | 439 | commit_message $2 |
0205e72f MH |
440 | ;; |
441 | fixup) | |
442 | echo | |
180bad3d | 443 | printf '%s\n' "$comment_char The $(nth_string $count) commit message will be skipped:" |
0205e72f | 444 | echo |
180bad3d JK |
445 | # Change the space after the comment character to TAB: |
446 | commit_message $2 | git stripspace --comment-lines | sed -e 's/ / /' | |
0205e72f | 447 | ;; |
6bb4e485 | 448 | esac >>"$squash_msg" |
6368f3f8 JS |
449 | } |
450 | ||
451 | peek_next_command () { | |
180bad3d | 452 | git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q |
6368f3f8 JS |
453 | } |
454 | ||
6bdcd0d2 MH |
455 | # A squash/fixup has failed. Prepare the long version of the squash |
456 | # commit message, then die_with_patch. This code path requires the | |
457 | # user to edit the combined commit message for all commits that have | |
458 | # been squashed/fixedup so far. So also erase the old squash | |
459 | # messages, effectively causing the combined commit to be used as the | |
460 | # new basis for any further squash/fixups. Args: sha1 rest | |
461 | die_failed_squash() { | |
6bb4e485 MZ |
462 | mv "$squash_msg" "$msg" || exit |
463 | rm -f "$fixup_msg" | |
464 | cp "$msg" "$GIT_DIR"/MERGE_MSG || exit | |
6bdcd0d2 MH |
465 | warn |
466 | warn "Could not apply $1... $2" | |
467 | die_with_patch $1 "" | |
468 | } | |
469 | ||
b079feed | 470 | flush_rewritten_pending() { |
6bb4e485 | 471 | test -s "$rewritten_pending" || return |
b079feed | 472 | newsha1="$(git rev-parse HEAD^0)" |
6bb4e485 MZ |
473 | sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list" |
474 | rm -f "$rewritten_pending" | |
b079feed TR |
475 | } |
476 | ||
477 | record_in_rewritten() { | |
478 | oldsha1="$(git rev-parse $1)" | |
6bb4e485 | 479 | echo "$oldsha1" >> "$rewritten_pending" |
b079feed TR |
480 | |
481 | case "$(peek_next_command)" in | |
41f556b9 | 482 | squash|s|fixup|f) |
b079feed | 483 | ;; |
41f556b9 | 484 | *) |
b079feed TR |
485 | flush_rewritten_pending |
486 | ;; | |
487 | esac | |
488 | } | |
489 | ||
df5df20c CW |
490 | do_pick () { |
491 | if test "$(git rev-parse HEAD)" = "$squash_onto" | |
492 | then | |
493 | # Set the correct commit message and author info on the | |
494 | # sentinel root before cherry-picking the original changes | |
495 | # without committing (-n). Finally, update the sentinel again | |
496 | # to include these changes. If the cherry-pick results in a | |
497 | # conflict, this means our behaviour is similar to a standard | |
498 | # failed cherry-pick during rebase, with a dirty index to | |
499 | # resolve before manually running git commit --amend then git | |
500 | # rebase --continue. | |
501 | git commit --allow-empty --allow-empty-message --amend \ | |
502 | --no-post-rewrite -n -q -C $1 && | |
503 | pick_one -n $1 && | |
504 | git commit --allow-empty --allow-empty-message \ | |
3ee5e540 NV |
505 | --amend --no-post-rewrite -n -q -C $1 \ |
506 | ${gpg_sign_opt:+"$gpg_sign_opt"} || | |
df5df20c CW |
507 | die_with_patch $1 "Could not apply $1... $2" |
508 | else | |
509 | pick_one $1 || | |
510 | die_with_patch $1 "Could not apply $1... $2" | |
511 | fi | |
512 | } | |
513 | ||
1b1dce4b | 514 | do_next () { |
b12d3e90 | 515 | rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha || exit |
6bb4e485 | 516 | read -r command sha1 rest < "$todo" |
1b1dce4b | 517 | case "$command" in |
c9266d58 | 518 | "$comment_char"*|''|noop|drop|d) |
1b1dce4b | 519 | mark_action_done |
1b1dce4b | 520 | ;; |
39743cf5 JH |
521 | "$cr") |
522 | # Work around CR left by "read" (e.g. with Git for Windows' Bash). | |
523 | mark_action_done | |
524 | ;; | |
f8babc4d | 525 | pick|p) |
1b1dce4b JS |
526 | comment_for_reflog pick |
527 | ||
528 | mark_action_done | |
df5df20c | 529 | do_pick $sha1 "$rest" |
b079feed | 530 | record_in_rewritten $sha1 |
1b1dce4b | 531 | ;; |
6741aa6c BG |
532 | reword|r) |
533 | comment_for_reflog reword | |
534 | ||
535 | mark_action_done | |
df5df20c | 536 | do_pick $sha1 "$rest" |
3ee5e540 | 537 | git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} || { |
0becb3e4 AW |
538 | warn "Could not amend commit after successfully picking $sha1... $rest" |
539 | warn "This is most likely due to an empty commit message, or the pre-commit hook" | |
540 | warn "failed. If the pre-commit hook failed, you may need to resolve the issue before" | |
541 | warn "you are able to reword the commit." | |
542 | exit_with_patch $sha1 1 | |
543 | } | |
b079feed | 544 | record_in_rewritten $sha1 |
6741aa6c | 545 | ;; |
f8babc4d | 546 | edit|e) |
1b1dce4b JS |
547 | comment_for_reflog edit |
548 | ||
549 | mark_action_done | |
df5df20c | 550 | do_pick $sha1 "$rest" |
14c793e8 RT |
551 | sha1_abbrev=$(git rev-parse --short $sha1) |
552 | warn "Stopped at $sha1_abbrev... $rest" | |
0becb3e4 | 553 | exit_with_patch $sha1 0 |
1b1dce4b | 554 | ;; |
0205e72f MH |
555 | squash|s|fixup|f) |
556 | case "$command" in | |
557 | squash|s) | |
558 | squash_style=squash | |
559 | ;; | |
560 | fixup|f) | |
561 | squash_style=fixup | |
562 | ;; | |
563 | esac | |
564 | comment_for_reflog $squash_style | |
1b1dce4b | 565 | |
6bb4e485 | 566 | test -f "$done" && has_action "$done" || |
0205e72f | 567 | die "Cannot '$squash_style' without a previous commit" |
1b1dce4b JS |
568 | |
569 | mark_action_done | |
a25eb139 | 570 | update_squash_messages $squash_style $sha1 |
6bb4e485 MZ |
571 | author_script_content=$(get_author_ident_from_commit HEAD) |
572 | echo "$author_script_content" > "$author_script" | |
573 | eval "$author_script_content" | |
2147f844 CW |
574 | if ! pick_one -n $sha1 |
575 | then | |
576 | git rev-parse --verify HEAD >"$amend" | |
577 | die_failed_squash $sha1 "$rest" | |
578 | fi | |
6368f3f8 | 579 | case "$(peek_next_command)" in |
0205e72f | 580 | squash|s|fixup|f) |
a25eb139 MH |
581 | # This is an intermediate commit; its message will only be |
582 | # used in case of trouble. So use the long version: | |
3ee5e540 NV |
583 | do_with_author output git commit --amend --no-verify -F "$squash_msg" \ |
584 | ${gpg_sign_opt:+"$gpg_sign_opt"} || | |
6bdcd0d2 | 585 | die_failed_squash $sha1 "$rest" |
376ccb8c | 586 | ;; |
6368f3f8 | 587 | *) |
a25eb139 | 588 | # This is the final command of this squash/fixup group |
6bb4e485 | 589 | if test -f "$fixup_msg" |
a25eb139 | 590 | then |
3ee5e540 NV |
591 | do_with_author git commit --amend --no-verify -F "$fixup_msg" \ |
592 | ${gpg_sign_opt:+"$gpg_sign_opt"} || | |
6bdcd0d2 MH |
593 | die_failed_squash $sha1 "$rest" |
594 | else | |
6bb4e485 | 595 | cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit |
6bdcd0d2 | 596 | rm -f "$GIT_DIR"/MERGE_MSG |
3ee5e540 NV |
597 | do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \ |
598 | ${gpg_sign_opt:+"$gpg_sign_opt"} || | |
6bdcd0d2 | 599 | die_failed_squash $sha1 "$rest" |
a25eb139 | 600 | fi |
6bb4e485 | 601 | rm -f "$squash_msg" "$fixup_msg" |
376ccb8c | 602 | ;; |
6368f3f8 | 603 | esac |
b079feed | 604 | record_in_rewritten $sha1 |
1b1dce4b | 605 | ;; |
cd035b1c | 606 | x|"exec") |
6bb4e485 | 607 | read -r command rest < "$todo" |
cd035b1c MM |
608 | mark_action_done |
609 | printf 'Executing: %s\n' "$rest" | |
fe9394ad | 610 | "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution |
cd035b1c | 611 | status=$? |
1686519a JH |
612 | # Run in subshell because require_clean_work_tree can die. |
613 | dirty=f | |
614 | (require_clean_work_tree "rebase" 2>/dev/null) || dirty=t | |
cd035b1c MM |
615 | if test "$status" -ne 0 |
616 | then | |
617 | warn "Execution failed: $rest" | |
1686519a JH |
618 | test "$dirty" = f || |
619 | warn "and made changes to the index and/or the working tree" | |
620 | ||
cd035b1c MM |
621 | warn "You can fix the problem, and then run" |
622 | warn | |
623 | warn " git rebase --continue" | |
624 | warn | |
ecfe1ea9 JS |
625 | if test $status -eq 127 # command not found |
626 | then | |
627 | status=1 | |
628 | fi | |
cd035b1c | 629 | exit "$status" |
1686519a | 630 | elif test "$dirty" = t |
cd035b1c | 631 | then |
1686519a JH |
632 | warn "Execution succeeded: $rest" |
633 | warn "but left changes to the index and/or the working tree" | |
cd035b1c MM |
634 | warn "Commit or stash your changes, and then run" |
635 | warn | |
636 | warn " git rebase --continue" | |
637 | warn | |
638 | exit 1 | |
639 | fi | |
640 | ;; | |
1b1dce4b JS |
641 | *) |
642 | warn "Unknown command: $command $sha1 $rest" | |
9c8e1011 | 643 | fixtodo="Please fix this using 'git rebase --edit-todo'." |
f1be316a JK |
644 | if git rev-parse --verify -q "$sha1" >/dev/null |
645 | then | |
9c8e1011 | 646 | die_with_patch $sha1 "$fixtodo" |
f1be316a | 647 | else |
9c8e1011 | 648 | die "$fixtodo" |
f1be316a | 649 | fi |
376ccb8c | 650 | ;; |
1b1dce4b | 651 | esac |
6bb4e485 | 652 | test -s "$todo" && return |
1b1dce4b | 653 | |
68a163c9 | 654 | comment_for_reflog finish && |
6bb4e485 | 655 | newhead=$(git rev-parse HEAD) && |
431b7e78 | 656 | case $head_name in |
73697a0b | 657 | refs/*) |
1af221ef | 658 | message="$GIT_REFLOG_ACTION: $head_name onto $onto" && |
431b7e78 | 659 | git update-ref -m "$message" $head_name $newhead $orig_head && |
53f2ffa8 JK |
660 | git symbolic-ref \ |
661 | -m "$GIT_REFLOG_ACTION: returning to $head_name" \ | |
662 | HEAD $head_name | |
73697a0b JS |
663 | ;; |
664 | esac && { | |
431b7e78 | 665 | test ! -f "$state_dir"/verbose || |
2959c283 | 666 | git diff-tree --stat $orig_head..HEAD |
3df0a859 | 667 | } && |
eb2151bb | 668 | { |
6bb4e485 MZ |
669 | test -s "$rewritten_list" && |
670 | git notes copy --for-rewrite=rebase < "$rewritten_list" || | |
eb2151bb TR |
671 | true # we don't care if this copying failed |
672 | } && | |
b849b954 NTND |
673 | hook="$(git rev-parse --git-path hooks/post-rewrite)" |
674 | if test -x "$hook" && test -s "$rewritten_list"; then | |
675 | "$hook" rebase < "$rewritten_list" | |
b079feed TR |
676 | true # we don't care if this hook failed |
677 | fi && | |
431b7e78 | 678 | warn "Successfully rebased and updated $head_name." |
1b1dce4b | 679 | |
15d4bf2e | 680 | return 1 # not failure; just to break the do_rest loop |
1b1dce4b JS |
681 | } |
682 | ||
15d4bf2e | 683 | # can only return 0, when the infinite loop breaks |
1b1dce4b JS |
684 | do_rest () { |
685 | while : | |
686 | do | |
15d4bf2e | 687 | do_next || break |
1b1dce4b | 688 | done |
1b1dce4b JS |
689 | } |
690 | ||
0e757e30 JS |
691 | # skip picking commits whose parents are unchanged |
692 | skip_unnecessary_picks () { | |
693 | fd=3 | |
2d6ca6ef | 694 | while read -r command rest |
0e757e30 JS |
695 | do |
696 | # fd=3 means we skip the command | |
2d6ca6ef BC |
697 | case "$fd,$command" in |
698 | 3,pick|3,p) | |
6bb4e485 | 699 | # pick a commit whose parent is current $onto -> skip |
14d87298 | 700 | sha1=${rest%% *} |
2d6ca6ef | 701 | case "$(git rev-parse --verify --quiet "$sha1"^)" in |
6bb4e485 MZ |
702 | "$onto"*) |
703 | onto=$sha1 | |
2d6ca6ef BC |
704 | ;; |
705 | *) | |
706 | fd=1 | |
707 | ;; | |
708 | esac | |
0e757e30 | 709 | ;; |
7bca7afe | 710 | 3,"$comment_char"*|3,) |
0e757e30 JS |
711 | # copy comments |
712 | ;; | |
713 | *) | |
714 | fd=1 | |
715 | ;; | |
716 | esac | |
d1c3b10f | 717 | printf '%s\n' "$command${rest:+ }$rest" >&$fd |
6bb4e485 MZ |
718 | done <"$todo" >"$todo.new" 3>>"$done" && |
719 | mv -f "$todo".new "$todo" && | |
b079feed TR |
720 | case "$(peek_next_command)" in |
721 | squash|s|fixup|f) | |
6bb4e485 | 722 | record_in_rewritten "$onto" |
b079feed TR |
723 | ;; |
724 | esac || | |
0e757e30 JS |
725 | die "Could not skip unnecessary pick commands" |
726 | } | |
727 | ||
75c69766 JH |
728 | transform_todo_ids () { |
729 | while read -r command rest | |
730 | do | |
731 | case "$command" in | |
732 | "$comment_char"* | exec) | |
733 | # Be careful for oddball commands like 'exec' | |
734 | # that do not have a SHA-1 at the beginning of $rest. | |
735 | ;; | |
736 | *) | |
31bff641 MM |
737 | sha1=$(git rev-parse --verify --quiet "$@" ${rest%%[ ]*}) && |
738 | rest="$sha1 ${rest#*[ ]}" | |
75c69766 JH |
739 | ;; |
740 | esac | |
741 | printf '%s\n' "$command${rest:+ }$rest" | |
742 | done <"$todo" >"$todo.new" && | |
743 | mv -f "$todo.new" "$todo" | |
744 | } | |
745 | ||
746 | expand_todo_ids() { | |
747 | transform_todo_ids | |
748 | } | |
749 | ||
750 | collapse_todo_ids() { | |
56895038 | 751 | transform_todo_ids --short |
75c69766 JH |
752 | } |
753 | ||
f59baa50 NS |
754 | # Rearrange the todo list that has both "pick sha1 msg" and |
755 | # "pick sha1 fixup!/squash! msg" appears in it so that the latter | |
756 | # comes immediately after the former, and change "pick" to | |
757 | # "fixup"/"squash". | |
16cf51c7 MR |
758 | # |
759 | # Note that if the config has specified a custom instruction format | |
760 | # each log message will be re-retrieved in order to normalize the | |
761 | # autosquash arrangement | |
f59baa50 | 762 | rearrange_squash () { |
68d5d03b KB |
763 | # extract fixup!/squash! lines and resolve any referenced sha1's |
764 | while read -r pick sha1 message | |
765 | do | |
16cf51c7 | 766 | test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1}) |
68d5d03b KB |
767 | case "$message" in |
768 | "squash! "*|"fixup! "*) | |
769 | action="${message%%!*}" | |
22c5b136 AP |
770 | rest=$message |
771 | prefix= | |
772 | # skip all squash! or fixup! (but save for later) | |
773 | while : | |
774 | do | |
775 | case "$rest" in | |
776 | "squash! "*|"fixup! "*) | |
777 | prefix="$prefix${rest%%!*}," | |
778 | rest="${rest#*! }" | |
779 | ;; | |
780 | *) | |
781 | break | |
782 | ;; | |
783 | esac | |
784 | done | |
47be0660 | 785 | printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest" |
68d5d03b KB |
786 | # if it's a single word, try to resolve to a full sha1 and |
787 | # emit a second copy. This allows us to match on both message | |
788 | # and on sha1 prefix | |
789 | if test "${rest#* }" = "$rest"; then | |
790 | fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)" | |
791 | if test -n "$fullsha"; then | |
792 | # prefix the action to uniquely identify this line as | |
793 | # intended for full sha1 match | |
22c5b136 | 794 | echo "$sha1 +$action $prefix $fullsha" |
68d5d03b KB |
795 | fi |
796 | fi | |
797 | esac | |
798 | done >"$1.sq" <"$1" | |
f59baa50 NS |
799 | test -s "$1.sq" || return |
800 | ||
801 | used= | |
57f2b6b2 | 802 | while read -r pick sha1 message |
f59baa50 NS |
803 | do |
804 | case " $used" in | |
805 | *" $sha1 "*) continue ;; | |
806 | esac | |
938791cd | 807 | printf '%s\n' "$pick $sha1 $message" |
16cf51c7 | 808 | test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1}) |
d3d7a421 | 809 | used="$used$sha1 " |
22c5b136 | 810 | while read -r squash action msg_prefix msg_content |
f59baa50 | 811 | do |
d3d7a421 KB |
812 | case " $used" in |
813 | *" $squash "*) continue ;; | |
814 | esac | |
68d5d03b KB |
815 | emit=0 |
816 | case "$action" in | |
817 | +*) | |
818 | action="${action#+}" | |
819 | # full sha1 prefix test | |
6bb4e485 | 820 | case "$msg_content" in "$sha1"*) emit=1;; esac ;; |
68d5d03b KB |
821 | *) |
822 | # message prefix test | |
6bb4e485 | 823 | case "$message" in "$msg_content"*) emit=1;; esac ;; |
68d5d03b KB |
824 | esac |
825 | if test $emit = 1; then | |
16cf51c7 MR |
826 | if test -n "${format}" |
827 | then | |
828 | msg_content=$(git log -n 1 --format="${format}" ${squash}) | |
829 | else | |
830 | msg_content="$(echo "$msg_prefix" | sed "s/,/! /g")$msg_content" | |
831 | fi | |
832 | printf '%s\n' "$action $squash $msg_content" | |
f59baa50 | 833 | used="$used$squash " |
68d5d03b | 834 | fi |
f59baa50 NS |
835 | done <"$1.sq" |
836 | done >"$1.rearranged" <"$1" | |
837 | cat "$1.rearranged" >"$1" | |
838 | rm -f "$1.sq" "$1.rearranged" | |
839 | } | |
840 | ||
c2145384 LK |
841 | # Add commands after a pick or after a squash/fixup serie |
842 | # in the todo list. | |
843 | add_exec_commands () { | |
844 | { | |
845 | first=t | |
846 | while read -r insn rest | |
847 | do | |
848 | case $insn in | |
849 | pick) | |
850 | test -n "$first" || | |
851 | printf "%s" "$cmd" | |
852 | ;; | |
853 | esac | |
854 | printf "%s %s\n" "$insn" "$rest" | |
855 | first= | |
856 | done | |
857 | printf "%s" "$cmd" | |
858 | } <"$1" >"$1.new" && | |
859 | mv "$1.new" "$1" | |
860 | } | |
861 | ||
804098bb GR |
862 | # Check if the SHA-1 passed as an argument is a |
863 | # correct one, if not then print $2 in "$todo".badsha | |
864 | # $1: the SHA-1 to test | |
1db168ee MM |
865 | # $2: the line number of the input |
866 | # $3: the input filename | |
804098bb GR |
867 | check_commit_sha () { |
868 | badsha=0 | |
869 | if test -z $1 | |
870 | then | |
871 | badsha=1 | |
872 | else | |
873 | sha1_verif="$(git rev-parse --verify --quiet $1^{commit})" | |
874 | if test -z $sha1_verif | |
875 | then | |
876 | badsha=1 | |
877 | fi | |
878 | fi | |
879 | ||
880 | if test $badsha -ne 0 | |
881 | then | |
1db168ee | 882 | line="$(sed -n -e "${2}p" "$3")" |
804098bb GR |
883 | warn "Warning: the SHA-1 is missing or isn't" \ |
884 | "a commit in the following line:" | |
1db168ee | 885 | warn " - $line" |
804098bb GR |
886 | warn |
887 | fi | |
888 | ||
889 | return $badsha | |
890 | } | |
891 | ||
892 | # prints the bad commits and bad commands | |
893 | # from the todolist in stdin | |
894 | check_bad_cmd_and_sha () { | |
895 | retval=0 | |
1db168ee MM |
896 | lineno=0 |
897 | while read -r command rest | |
898 | do | |
899 | lineno=$(( $lineno + 1 )) | |
900 | case $command in | |
901 | "$comment_char"*|''|noop|x|exec) | |
902 | # Doesn't expect a SHA-1 | |
903 | ;; | |
39743cf5 JH |
904 | "$cr") |
905 | # Work around CR left by "read" (e.g. with Git for | |
906 | # Windows' Bash). | |
907 | ;; | |
1db168ee MM |
908 | pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f) |
909 | if ! check_commit_sha "${rest%%[ ]*}" "$lineno" "$1" | |
910 | then | |
804098bb | 911 | retval=1 |
1db168ee MM |
912 | fi |
913 | ;; | |
914 | *) | |
915 | line="$(sed -n -e "${lineno}p" "$1")" | |
916 | warn "Warning: the command isn't recognized" \ | |
917 | "in the following line:" | |
918 | warn " - $line" | |
919 | warn | |
920 | retval=1 | |
921 | ;; | |
922 | esac | |
923 | done <"$1" | |
924 | return $retval | |
804098bb GR |
925 | } |
926 | ||
37079959 GR |
927 | # Print the list of the SHA-1 of the commits |
928 | # from stdin to stdout | |
929 | todo_list_to_sha_list () { | |
930 | git stripspace --strip-comments | | |
931 | while read -r command sha1 rest | |
932 | do | |
933 | case $command in | |
934 | "$comment_char"*|''|noop|x|"exec") | |
935 | ;; | |
936 | *) | |
937 | long_sha=$(git rev-list --no-walk "$sha1" 2>/dev/null) | |
938 | printf "%s\n" "$long_sha" | |
939 | ;; | |
940 | esac | |
941 | done | |
942 | } | |
943 | ||
944 | # Use warn for each line in stdin | |
945 | warn_lines () { | |
946 | while read -r line | |
947 | do | |
948 | warn " - $line" | |
949 | done | |
950 | } | |
951 | ||
952 | # Switch to the branch in $into and notify it in the reflog | |
953 | checkout_onto () { | |
954 | GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" | |
955 | output git checkout $onto || die_abort "could not detach HEAD" | |
956 | git update-ref ORIG_HEAD $orig_head | |
957 | } | |
958 | ||
959 | get_missing_commit_check_level () { | |
960 | check_level=$(git config --get rebase.missingCommitsCheck) | |
961 | check_level=${check_level:-ignore} | |
962 | # Don't be case sensitive | |
963 | printf '%s' "$check_level" | tr 'A-Z' 'a-z' | |
964 | } | |
965 | ||
966 | # Check if the user dropped some commits by mistake | |
967 | # Behaviour determined by rebase.missingCommitsCheck. | |
804098bb GR |
968 | # Check if there is an unrecognized command or a |
969 | # bad SHA-1 in a command. | |
37079959 GR |
970 | check_todo_list () { |
971 | raise_error=f | |
972 | ||
973 | check_level=$(get_missing_commit_check_level) | |
974 | ||
975 | case "$check_level" in | |
976 | warn|error) | |
977 | # Get the SHA-1 of the commits | |
978 | todo_list_to_sha_list <"$todo".backup >"$todo".oldsha1 | |
979 | todo_list_to_sha_list <"$todo" >"$todo".newsha1 | |
980 | ||
981 | # Sort the SHA-1 and compare them | |
982 | sort -u "$todo".oldsha1 >"$todo".oldsha1+ | |
983 | mv "$todo".oldsha1+ "$todo".oldsha1 | |
984 | sort -u "$todo".newsha1 >"$todo".newsha1+ | |
985 | mv "$todo".newsha1+ "$todo".newsha1 | |
986 | comm -2 -3 "$todo".oldsha1 "$todo".newsha1 >"$todo".miss | |
987 | ||
988 | # Warn about missing commits | |
989 | if test -s "$todo".miss | |
990 | then | |
991 | test "$check_level" = error && raise_error=t | |
992 | ||
993 | warn "Warning: some commits may have been dropped" \ | |
994 | "accidentally." | |
995 | warn "Dropped commits (newer to older):" | |
996 | ||
997 | # Make the list user-friendly and display | |
998 | opt="--no-walk=sorted --format=oneline --abbrev-commit --stdin" | |
999 | git rev-list $opt <"$todo".miss | warn_lines | |
1000 | ||
1001 | warn "To avoid this message, use \"drop\" to" \ | |
1002 | "explicitly remove a commit." | |
1003 | warn | |
1004 | warn "Use 'git config rebase.missingCommitsCheck' to change" \ | |
1005 | "the level of warnings." | |
1006 | warn "The possible behaviours are: ignore, warn, error." | |
1007 | warn | |
1008 | fi | |
1009 | ;; | |
1010 | ignore) | |
1011 | ;; | |
1012 | *) | |
1013 | warn "Unrecognized setting $check_level for option" \ | |
1014 | "rebase.missingCommitsCheck. Ignoring." | |
1015 | ;; | |
1016 | esac | |
1017 | ||
1db168ee | 1018 | if ! check_bad_cmd_and_sha "$todo" |
804098bb GR |
1019 | then |
1020 | raise_error=t | |
1021 | fi | |
1022 | ||
37079959 GR |
1023 | if test $raise_error = t |
1024 | then | |
1025 | # Checkout before the first commit of the | |
1026 | # rebase: this way git rebase --continue | |
1027 | # will work correctly as it expects HEAD to be | |
1028 | # placed before the commit of the next action | |
1029 | checkout_onto | |
1030 | ||
1031 | warn "You can fix this with 'git rebase --edit-todo'." | |
1032 | die "Or you can abort the rebase with 'git rebase --abort'." | |
1033 | fi | |
1034 | } | |
1035 | ||
9f50d32b KM |
1036 | # The whole contents of this file is run by dot-sourcing it from |
1037 | # inside a shell function. It used to be that "return"s we see | |
1038 | # below were not inside any function, and expected to return | |
1039 | # to the function that dot-sourced us. | |
1040 | # | |
1041 | # However, FreeBSD /bin/sh misbehaves on such a construct and | |
1042 | # continues to run the statements that follow such a "return". | |
1043 | # As a work-around, we introduce an extra layer of a function | |
1044 | # here, and immediately call it after defining it. | |
1045 | git_rebase__interactive () { | |
1046 | ||
cf432ca0 MZ |
1047 | case "$action" in |
1048 | continue) | |
cf432ca0 | 1049 | # do we have anything to commit? |
a6754cda | 1050 | if git diff-index --cached --quiet HEAD -- |
cf432ca0 | 1051 | then |
0e0aff4b JS |
1052 | # Nothing to commit -- skip this commit |
1053 | ||
1054 | test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD || | |
1055 | rm "$GIT_DIR"/CHERRY_PICK_HEAD || | |
1056 | die "Could not remove CHERRY_PICK_HEAD" | |
cf432ca0 | 1057 | else |
ffaaed88 MM |
1058 | if ! test -f "$author_script" |
1059 | then | |
3ee5e540 | 1060 | gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} |
ffaaed88 MM |
1061 | die "You have staged changes in your working tree. If these changes are meant to be |
1062 | squashed into the previous commit, run: | |
1063 | ||
3ee5e540 | 1064 | git commit --amend $gpg_sign_opt_quoted |
ffaaed88 MM |
1065 | |
1066 | If they are meant to go into a new commit, run: | |
1067 | ||
3ee5e540 | 1068 | git commit $gpg_sign_opt_quoted |
ffaaed88 MM |
1069 | |
1070 | In both case, once you're done, continue with: | |
1071 | ||
1072 | git rebase --continue | |
1073 | " | |
1074 | fi | |
cf432ca0 | 1075 | . "$author_script" || |
ffaaed88 | 1076 | die "Error trying to find the author identity to amend commit" |
cf432ca0 | 1077 | if test -f "$amend" |
03270628 | 1078 | then |
cf432ca0 MZ |
1079 | current_head=$(git rev-parse --verify HEAD) |
1080 | test "$current_head" = $(cat "$amend") || | |
1081 | die "\ | |
c14c3c82 DP |
1082 | You have uncommitted changes in your working tree. Please, commit them |
1083 | first and then run 'git rebase --continue' again." | |
3ee5e540 NV |
1084 | do_with_author git commit --amend --no-verify -F "$msg" -e \ |
1085 | ${gpg_sign_opt:+"$gpg_sign_opt"} || | |
2147f844 CW |
1086 | die "Could not commit staged changes." |
1087 | else | |
3ee5e540 NV |
1088 | do_with_author git commit --no-verify -F "$msg" -e \ |
1089 | ${gpg_sign_opt:+"$gpg_sign_opt"} || | |
2147f844 | 1090 | die "Could not commit staged changes." |
03270628 | 1091 | fi |
cf432ca0 | 1092 | fi |
18640d99 | 1093 | |
b12d3e90 MM |
1094 | if test -r "$state_dir"/stopped-sha |
1095 | then | |
1096 | record_in_rewritten "$(cat "$state_dir"/stopped-sha)" | |
1097 | fi | |
0acb62f2 | 1098 | |
cf432ca0 MZ |
1099 | require_clean_work_tree "rebase" |
1100 | do_rest | |
15d4bf2e | 1101 | return 0 |
cf432ca0 | 1102 | ;; |
cf432ca0 | 1103 | skip) |
cf432ca0 | 1104 | git rerere clear |
cf432ca0 | 1105 | |
2959c283 | 1106 | do_rest |
15d4bf2e | 1107 | return 0 |
cf432ca0 | 1108 | ;; |
eb9a7cb4 | 1109 | edit-todo) |
180bad3d | 1110 | git stripspace --strip-comments <"$todo" >"$todo".new |
eb9a7cb4 | 1111 | mv -f "$todo".new "$todo" |
75c69766 | 1112 | collapse_todo_ids |
eb9a7cb4 | 1113 | append_todo_help |
180bad3d JK |
1114 | git stripspace --comment-lines >>"$todo" <<\EOF |
1115 | ||
1116 | You are editing the todo file of an ongoing interactive rebase. | |
1117 | To continue rebase after editing, run: | |
1118 | git rebase --continue | |
1119 | ||
eb9a7cb4 AW |
1120 | EOF |
1121 | ||
1122 | git_sequence_editor "$todo" || | |
1123 | die "Could not execute editor" | |
75c69766 | 1124 | expand_todo_ids |
eb9a7cb4 AW |
1125 | |
1126 | exit | |
1127 | ;; | |
cf432ca0 | 1128 | esac |
1b1dce4b | 1129 | |
34262322 MZ |
1130 | git var GIT_COMMITTER_IDENT >/dev/null || |
1131 | die "You need to set your committer info first" | |
1b1dce4b | 1132 | |
34262322 MZ |
1133 | comment_for_reflog start |
1134 | ||
71786f54 | 1135 | if test ! -z "$switch_to" |
34262322 | 1136 | then |
26cd160c | 1137 | GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" |
71786f54 | 1138 | output git checkout "$switch_to" -- || |
26cd160c RR |
1139 | die "Could not checkout $switch_to" |
1140 | ||
1141 | comment_for_reflog start | |
34262322 MZ |
1142 | fi |
1143 | ||
431b7e78 | 1144 | orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?" |
1224f3d0 | 1145 | mkdir -p "$state_dir" || die "Could not create temporary $state_dir" |
34262322 | 1146 | |
431b7e78 | 1147 | : > "$state_dir"/interactive || die "Could not mark as interactive" |
84df4560 | 1148 | write_basic_state |
6bb4e485 | 1149 | if test t = "$preserve_merges" |
34262322 | 1150 | then |
6bb4e485 | 1151 | if test -z "$rebase_root" |
34262322 | 1152 | then |
6bb4e485 | 1153 | mkdir "$rewritten" && |
431b7e78 | 1154 | for c in $(git merge-base --all $orig_head $upstream) |
acc8559a | 1155 | do |
6bb4e485 | 1156 | echo $onto > "$rewritten"/$c || |
34262322 | 1157 | die "Could not init rewritten commits" |
acc8559a | 1158 | done |
34262322 | 1159 | else |
6bb4e485 MZ |
1160 | mkdir "$rewritten" && |
1161 | echo $onto > "$rewritten"/root || | |
34262322 MZ |
1162 | die "Could not init rewritten commits" |
1163 | fi | |
1164 | # No cherry-pick because our first pass is to determine | |
1165 | # parents to rewrite and skipping dropped commits would | |
1166 | # prematurely end our probe | |
6bb4e485 | 1167 | merges_option= |
34262322 | 1168 | else |
6bb4e485 | 1169 | merges_option="--no-merges --cherry-pick" |
34262322 MZ |
1170 | fi |
1171 | ||
431b7e78 | 1172 | shorthead=$(git rev-parse --short $orig_head) |
6bb4e485 MZ |
1173 | shortonto=$(git rev-parse --short $onto) |
1174 | if test -z "$rebase_root" | |
1175 | # this is now equivalent to ! -z "$upstream" | |
34262322 | 1176 | then |
6bb4e485 | 1177 | shortupstream=$(git rev-parse --short $upstream) |
431b7e78 | 1178 | revisions=$upstream...$orig_head |
6bb4e485 | 1179 | shortrevisions=$shortupstream..$shorthead |
34262322 | 1180 | else |
431b7e78 | 1181 | revisions=$onto...$orig_head |
6bb4e485 | 1182 | shortrevisions=$shorthead |
34262322 | 1183 | fi |
16cf51c7 MR |
1184 | format=$(git config --get rebase.instructionFormat) |
1185 | # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse | |
1186 | git rev-list $merges_option --format="%m%H ${format:-%s}" \ | |
1187 | --reverse --left-right --topo-order \ | |
1e0dacdb | 1188 | $revisions ${restrict_revision+^$restrict_revision} | \ |
34262322 | 1189 | sed -n "s/^>//p" | |
edb72d55 | 1190 | while read -r sha1 rest |
34262322 | 1191 | do |
90e1818f | 1192 | |
edb72d55 | 1193 | if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1 |
90e1818f | 1194 | then |
180bad3d | 1195 | comment_out="$comment_char " |
90e1818f NH |
1196 | else |
1197 | comment_out= | |
1198 | fi | |
1199 | ||
6bb4e485 | 1200 | if test t != "$preserve_merges" |
34262322 | 1201 | then |
edb72d55 | 1202 | printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo" |
34262322 | 1203 | else |
6bb4e485 | 1204 | if test -z "$rebase_root" |
acc8559a | 1205 | then |
34262322 MZ |
1206 | preserve=t |
1207 | for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-) | |
acc8559a | 1208 | do |
12bf8283 | 1209 | if test -f "$rewritten"/$p |
acc8559a | 1210 | then |
34262322 | 1211 | preserve=f |
acc8559a SH |
1212 | fi |
1213 | done | |
34262322 MZ |
1214 | else |
1215 | preserve=f | |
1216 | fi | |
1217 | if test f = "$preserve" | |
1218 | then | |
6bb4e485 | 1219 | touch "$rewritten"/$sha1 |
edb72d55 | 1220 | printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo" |
acc8559a | 1221 | fi |
34262322 MZ |
1222 | fi |
1223 | done | |
d911d146 | 1224 | |
34262322 | 1225 | # Watch for commits that been dropped by --cherry-pick |
6bb4e485 | 1226 | if test t = "$preserve_merges" |
34262322 | 1227 | then |
6bb4e485 | 1228 | mkdir "$dropped" |
34262322 | 1229 | # Save all non-cherry-picked changes |
6bb4e485 | 1230 | git rev-list $revisions --left-right --cherry-pick | \ |
431b7e78 | 1231 | sed -n "s/^>//p" > "$state_dir"/not-cherry-picks |
34262322 MZ |
1232 | # Now all commits and note which ones are missing in |
1233 | # not-cherry-picks and hence being dropped | |
6bb4e485 | 1234 | git rev-list $revisions | |
34262322 MZ |
1235 | while read rev |
1236 | do | |
214123c6 JH |
1237 | if test -f "$rewritten"/$rev && |
1238 | ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null | |
34262322 MZ |
1239 | then |
1240 | # Use -f2 because if rev-list is telling us this commit is | |
1241 | # not worthwhile, we don't want to track its multiple heads, | |
1242 | # just the history of its first-parent for others that will | |
1243 | # be rebasing on top of it | |
6bb4e485 | 1244 | git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$dropped"/$rev |
edb72d55 KS |
1245 | sha1=$(git rev-list -1 $rev) |
1246 | sane_grep -v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo" | |
6bb4e485 | 1247 | rm "$rewritten"/$rev |
34262322 MZ |
1248 | fi |
1249 | done | |
1250 | fi | |
1251 | ||
6bb4e485 MZ |
1252 | test -s "$todo" || echo noop >> "$todo" |
1253 | test -n "$autosquash" && rearrange_squash "$todo" | |
c2145384 LK |
1254 | test -n "$cmd" && add_exec_commands "$todo" |
1255 | ||
97f05f43 | 1256 | todocount=$(git stripspace --strip-comments <"$todo" | wc -l) |
28c8cfc3 | 1257 | todocount=${todocount##* } |
97f05f43 | 1258 | |
180bad3d | 1259 | cat >>"$todo" <<EOF |
6047a234 | 1260 | |
2185d3b7 | 1261 | $comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s)) |
fcc5ef1c AW |
1262 | EOF |
1263 | append_todo_help | |
180bad3d JK |
1264 | git stripspace --comment-lines >>"$todo" <<\EOF |
1265 | ||
1266 | However, if you remove everything, the rebase will be aborted. | |
1267 | ||
1b1dce4b | 1268 | EOF |
1b1dce4b | 1269 | |
90e1818f NH |
1270 | if test -z "$keep_empty" |
1271 | then | |
180bad3d | 1272 | printf '%s\n' "$comment_char Note that empty commits are commented out" >>"$todo" |
90e1818f NH |
1273 | fi |
1274 | ||
1275 | ||
6bb4e485 | 1276 | has_action "$todo" || |
e4244eb3 | 1277 | return 2 |
1b1dce4b | 1278 | |
6bb4e485 | 1279 | cp "$todo" "$todo".backup |
edb72d55 | 1280 | collapse_todo_ids |
821881d8 | 1281 | git_sequence_editor "$todo" || |
34262322 | 1282 | die_abort "Could not execute editor" |
1b1dce4b | 1283 | |
6bb4e485 | 1284 | has_action "$todo" || |
e4244eb3 | 1285 | return 2 |
c54b7817 | 1286 | |
37079959 GR |
1287 | check_todo_list |
1288 | ||
75c69766 JH |
1289 | expand_todo_ids |
1290 | ||
6bb4e485 | 1291 | test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks |
0e757e30 | 1292 | |
37079959 | 1293 | checkout_onto |
34262322 | 1294 | do_rest |
9f50d32b KM |
1295 | |
1296 | } | |
1297 | # ... and then we call the whole thing. | |
1298 | git_rebase__interactive |