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