]>
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 | |
5840eb9d | 8 | # https://public-inbox.org/git/m1odwkyuf5.fsf_-_@ebiederm.dsl.xmission.com/ |
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 | ||
882cd237 JS |
96 | comment_char=$(git config --get core.commentchar 2>/dev/null) |
97 | case "$comment_char" in | |
98 | '' | auto) | |
99 | comment_char="#" | |
100 | ;; | |
101 | ?) | |
102 | ;; | |
103 | *) | |
104 | comment_char=$(echo "$comment_char" | cut -c1) | |
105 | ;; | |
106 | esac | |
180bad3d | 107 | |
1b1dce4b | 108 | warn () { |
938791cd | 109 | printf '%s\n' "$*" >&2 |
1b1dce4b JS |
110 | } |
111 | ||
ee0a4afb MH |
112 | # Output the commit message for the specified commit. |
113 | commit_message () { | |
114 | git cat-file commit "$1" | sed "1,/^$/d" | |
115 | } | |
116 | ||
6bb4e485 | 117 | orig_reflog_action="$GIT_REFLOG_ACTION" |
1b1dce4b JS |
118 | |
119 | comment_for_reflog () { | |
6bb4e485 | 120 | case "$orig_reflog_action" in |
1b1dce4b JS |
121 | ''|rebase*) |
122 | GIT_REFLOG_ACTION="rebase -i ($1)" | |
123 | export GIT_REFLOG_ACTION | |
376ccb8c | 124 | ;; |
1b1dce4b JS |
125 | esac |
126 | } | |
127 | ||
4e673877 | 128 | last_count= |
1b1dce4b | 129 | mark_action_done () { |
6bb4e485 MZ |
130 | sed -e 1q < "$todo" >> "$done" |
131 | sed -e 1d < "$todo" >> "$todo".new | |
132 | mv -f "$todo".new "$todo" | |
d9497518 | 133 | new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) )) |
b71dc3e1 | 134 | echo $new_count >"$msgnum" |
180bad3d | 135 | total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l))) |
b71dc3e1 | 136 | echo $total >"$end" |
6bb4e485 | 137 | if test "$last_count" != "$new_count" |
4e673877 | 138 | then |
6bb4e485 | 139 | last_count=$new_count |
9588c52b | 140 | eval_gettext "Rebasing (\$new_count/\$total)"; printf "\r" |
6bb4e485 | 141 | test -z "$verbose" || echo |
4e673877 | 142 | fi |
1b1dce4b JS |
143 | } |
144 | ||
8cbc57ca PH |
145 | # Put the last action marked done at the beginning of the todo list |
146 | # again. If there has not been an action marked done yet, leave the list of | |
147 | # items on the todo list unchanged. | |
148 | reschedule_last_action () { | |
149 | tail -n 1 "$done" | cat - "$todo" >"$todo".new | |
150 | sed -e \$d <"$done" >"$done".new | |
151 | mv -f "$todo".new "$todo" | |
152 | mv -f "$done".new "$done" | |
153 | } | |
154 | ||
fcc5ef1c | 155 | append_todo_help () { |
b8fc9e43 | 156 | gettext " |
180bad3d | 157 | Commands: |
4b8b65d7 JS |
158 | p, pick = use commit |
159 | r, reword = use commit, but edit the commit message | |
160 | e, edit = use commit, but stop for amending | |
161 | s, squash = use commit, but meld into previous commit | |
162 | f, fixup = like \"squash\", but discard this commit's log message | |
163 | x, exec = run command (the rest of the line) using shell | |
164 | d, drop = remove commit | |
180bad3d JK |
165 | |
166 | These lines can be re-ordered; they are executed from top to bottom. | |
b8fc9e43 | 167 | " | git stripspace --comment-lines >>"$todo" |
180bad3d | 168 | |
37079959 GR |
169 | if test $(get_missing_commit_check_level) = error |
170 | then | |
b8fc9e43 | 171 | gettext " |
37079959 | 172 | Do not remove any line. Use 'drop' explicitly to remove a commit. |
b8fc9e43 | 173 | " | git stripspace --comment-lines >>"$todo" |
37079959 | 174 | else |
b8fc9e43 | 175 | gettext " |
180bad3d | 176 | If you remove a line here THAT COMMIT WILL BE LOST. |
b8fc9e43 | 177 | " | git stripspace --comment-lines >>"$todo" |
37079959 | 178 | fi |
fcc5ef1c AW |
179 | } |
180 | ||
1b1dce4b | 181 | make_patch () { |
4fb1a19d JS |
182 | sha1_and_parents="$(git rev-list --parents -1 "$1")" |
183 | case "$sha1_and_parents" in | |
184 | ?*' '?*' '?*) | |
185 | git diff --cc $sha1_and_parents | |
186 | ;; | |
187 | ?*' '?*) | |
188 | git diff-tree -p "$1^!" | |
189 | ;; | |
190 | *) | |
191 | echo "Root commit" | |
192 | ;; | |
431b7e78 | 193 | esac > "$state_dir"/patch |
6bb4e485 MZ |
194 | test -f "$msg" || |
195 | commit_message "$1" > "$msg" | |
196 | test -f "$author_script" || | |
197 | get_author_ident_from_commit "$1" > "$author_script" | |
1b1dce4b JS |
198 | } |
199 | ||
200 | die_with_patch () { | |
431b7e78 | 201 | echo "$1" > "$state_dir"/stopped-sha |
fbd7a232 | 202 | git update-ref REBASE_HEAD "$1" |
1b1dce4b JS |
203 | make_patch "$1" |
204 | die "$2" | |
205 | } | |
206 | ||
0becb3e4 AW |
207 | exit_with_patch () { |
208 | echo "$1" > "$state_dir"/stopped-sha | |
fbd7a232 | 209 | git update-ref REBASE_HEAD "$1" |
0becb3e4 AW |
210 | make_patch $1 |
211 | git rev-parse --verify HEAD > "$amend" | |
3ee5e540 | 212 | gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} |
9588c52b VA |
213 | warn "$(eval_gettext "\ |
214 | You can amend the commit now, with | |
215 | ||
216 | git commit --amend \$gpg_sign_opt_quoted | |
217 | ||
218 | Once you are satisfied with your changes, run | |
219 | ||
220 | git rebase --continue")" | |
0becb3e4 AW |
221 | warn |
222 | exit $2 | |
223 | } | |
224 | ||
c54b7817 | 225 | die_abort () { |
33ba9c64 | 226 | apply_autostash |
431b7e78 | 227 | rm -rf "$state_dir" |
c54b7817 JS |
228 | die "$1" |
229 | } | |
230 | ||
376ccb8c | 231 | has_action () { |
180bad3d | 232 | test -n "$(git stripspace --strip-comments <"$1")" |
376ccb8c JS |
233 | } |
234 | ||
90e1818f | 235 | is_empty_commit() { |
9588c52b VA |
236 | tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null) || { |
237 | sha1=$1 | |
238 | die "$(eval_gettext "\$sha1: not a commit that can be picked")" | |
239 | } | |
240 | ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null) || | |
241 | ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
90e1818f NH |
242 | test "$tree" = "$ptree" |
243 | } | |
244 | ||
98697784 PH |
245 | is_merge_commit() |
246 | { | |
247 | git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1 | |
248 | } | |
249 | ||
7756ecff MH |
250 | # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and |
251 | # GIT_AUTHOR_DATE exported from the current environment. | |
252 | do_with_author () { | |
76c9c0db JH |
253 | ( |
254 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE | |
255 | "$@" | |
256 | ) | |
7756ecff MH |
257 | } |
258 | ||
821881d8 PO |
259 | git_sequence_editor () { |
260 | if test -z "$GIT_SEQUENCE_EDITOR" | |
261 | then | |
262 | GIT_SEQUENCE_EDITOR="$(git config sequence.editor)" | |
263 | if [ -z "$GIT_SEQUENCE_EDITOR" ] | |
264 | then | |
265 | GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $? | |
266 | fi | |
267 | fi | |
268 | ||
269 | eval "$GIT_SEQUENCE_EDITOR" '"$@"' | |
270 | } | |
271 | ||
1b1dce4b | 272 | pick_one () { |
8e75abfd | 273 | ff=--ff |
90e1818f | 274 | |
8e75abfd | 275 | case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac |
6bb4e485 | 276 | case "$force_rebase" in '') ;; ?*) ff= ;; esac |
9588c52b | 277 | output git rev-parse --verify $sha1 || die "$(eval_gettext "Invalid commit name: \$sha1")" |
90e1818f NH |
278 | |
279 | if is_empty_commit "$sha1" | |
280 | then | |
281 | empty_args="--allow-empty" | |
282 | fi | |
283 | ||
6bb4e485 | 284 | test -d "$rewritten" && |
f09c9b8c | 285 | pick_one_preserving_merges "$@" && return |
a6c612b5 | 286 | output eval git cherry-pick $allow_rerere_autoupdate $allow_empty_message \ |
3ee5e540 NV |
287 | ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \ |
288 | "$strategy_args" $empty_args $ff "$@" | |
8cbc57ca PH |
289 | |
290 | # If cherry-pick dies it leaves the to-be-picked commit unrecorded. Reschedule | |
291 | # previous task so this commit is not lost. | |
292 | ret=$? | |
293 | case "$ret" in [01]) ;; *) reschedule_last_action ;; esac | |
294 | return $ret | |
1b1dce4b JS |
295 | } |
296 | ||
f09c9b8c | 297 | pick_one_preserving_merges () { |
71d9451e TR |
298 | fast_forward=t |
299 | case "$1" in | |
300 | -n) | |
301 | fast_forward=f | |
302 | sha1=$2 | |
303 | ;; | |
304 | *) | |
305 | sha1=$1 | |
306 | ;; | |
307 | esac | |
f09c9b8c JS |
308 | sha1=$(git rev-parse $sha1) |
309 | ||
431b7e78 | 310 | if test -f "$state_dir"/current-commit |
f09c9b8c | 311 | then |
4c1360f4 | 312 | if test "$fast_forward" = t |
bb645071 | 313 | then |
41f556b9 | 314 | while read current_commit |
bb645071 | 315 | do |
6bb4e485 | 316 | git rev-parse HEAD > "$rewritten"/$current_commit |
431b7e78 MZ |
317 | done <"$state_dir"/current-commit |
318 | rm "$state_dir"/current-commit || | |
9588c52b | 319 | die "$(gettext "Cannot write current commit's replacement sha1")" |
bb645071 | 320 | fi |
f09c9b8c JS |
321 | fi |
322 | ||
431b7e78 | 323 | echo $sha1 >> "$state_dir"/current-commit |
a96dc01e | 324 | |
f09c9b8c | 325 | # rewrite parents; if none were rewritten, we can fast-forward. |
f09c9b8c | 326 | new_parents= |
d911d146 TR |
327 | pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)" |
328 | if test "$pend" = " " | |
329 | then | |
330 | pend=" root" | |
331 | fi | |
faae853c | 332 | while [ "$pend" != "" ] |
f09c9b8c | 333 | do |
faae853c SH |
334 | p=$(expr "$pend" : ' \([^ ]*\)') |
335 | pend="${pend# $p}" | |
336 | ||
6bb4e485 | 337 | if test -f "$rewritten"/$p |
f09c9b8c | 338 | then |
6bb4e485 | 339 | new_p=$(cat "$rewritten"/$p) |
80fe82e4 SH |
340 | |
341 | # If the todo reordered commits, and our parent is marked for | |
342 | # rewriting, but hasn't been gotten to yet, assume the user meant to | |
343 | # drop it on top of the current HEAD | |
344 | if test -z "$new_p" | |
345 | then | |
346 | new_p=$(git rev-parse HEAD) | |
347 | fi | |
348 | ||
f09c9b8c JS |
349 | test $p != $new_p && fast_forward=f |
350 | case "$new_parents" in | |
351 | *$new_p*) | |
352 | ;; # do nothing; that parent is already there | |
353 | *) | |
354 | new_parents="$new_parents $new_p" | |
376ccb8c | 355 | ;; |
f09c9b8c | 356 | esac |
1c5fa0a1 | 357 | else |
6bb4e485 | 358 | if test -f "$dropped"/$p |
faae853c SH |
359 | then |
360 | fast_forward=f | |
6bb4e485 | 361 | replacement="$(cat "$dropped"/$p)" |
d911d146 TR |
362 | test -z "$replacement" && replacement=root |
363 | pend=" $replacement$pend" | |
faae853c SH |
364 | else |
365 | new_parents="$new_parents $p" | |
366 | fi | |
f09c9b8c JS |
367 | fi |
368 | done | |
369 | case $fast_forward in | |
370 | t) | |
9588c52b | 371 | output warn "$(eval_gettext "Fast-forward to \$sha1")" |
71d9451e | 372 | output git reset --hard $sha1 || |
9588c52b | 373 | die "$(eval_gettext "Cannot fast-forward to \$sha1")" |
f09c9b8c JS |
374 | ;; |
375 | f) | |
376ccb8c | 376 | first_parent=$(expr "$new_parents" : ' \([^ ]*\)') |
a4f25e36 SH |
377 | |
378 | if [ "$1" != "-n" ] | |
379 | then | |
380 | # detach HEAD to current parent | |
381 | output git checkout $first_parent 2> /dev/null || | |
9588c52b | 382 | die "$(eval_gettext "Cannot move HEAD to \$first_parent")" |
a4f25e36 | 383 | fi |
f09c9b8c | 384 | |
f09c9b8c | 385 | case "$new_parents" in |
376ccb8c | 386 | ' '*' '*) |
9588c52b | 387 | test "a$1" = a-n && die "$(eval_gettext "Refusing to squash a merge: \$sha1")" |
a4f25e36 | 388 | |
f09c9b8c | 389 | # redo merge |
6bb4e485 MZ |
390 | author_script_content=$(get_author_ident_from_commit $sha1) |
391 | eval "$author_script_content" | |
392 | msg_content="$(commit_message $sha1)" | |
f91333d6 BS |
393 | # No point in merging the first parent, that's HEAD |
394 | new_parents=${new_parents# $first_parent} | |
a9f739c1 | 395 | merge_args="--no-log --no-ff" |
db2b3b82 | 396 | if ! do_with_author output eval \ |
dd6fb005 JS |
397 | git merge ${gpg_sign_opt:+$(git rev-parse \ |
398 | --sq-quote "$gpg_sign_opt")} \ | |
399 | $allow_rerere_autoupdate "$merge_args" \ | |
400 | "$strategy_args" \ | |
ed5144d7 | 401 | -m "$(git rev-parse --sq-quote "$msg_content")" \ |
dd6fb005 | 402 | "$new_parents" |
f09c9b8c | 403 | then |
6bb4e485 | 404 | printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG |
9588c52b | 405 | die_with_patch $sha1 "$(eval_gettext "Error redoing merge \$sha1")" |
f09c9b8c | 406 | fi |
6bb4e485 | 407 | echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list" |
f09c9b8c JS |
408 | ;; |
409 | *) | |
9b6d7a62 | 410 | output eval git cherry-pick $allow_rerere_autoupdate \ |
a6c612b5 | 411 | $allow_empty_message \ |
3ee5e540 NV |
412 | ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \ |
413 | "$strategy_args" "$@" || | |
9588c52b | 414 | die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")" |
376ccb8c | 415 | ;; |
f09c9b8c | 416 | esac |
376ccb8c | 417 | ;; |
f09c9b8c JS |
418 | esac |
419 | } | |
420 | ||
f2d17068 VA |
421 | this_nth_commit_message () { |
422 | n=$1 | |
8aa6dc1d | 423 | eval_gettext "This is the commit message #\${n}:" |
f2d17068 | 424 | } |
8aa6dc1d | 425 | |
f2d17068 VA |
426 | skip_nth_commit_message () { |
427 | n=$1 | |
8aa6dc1d | 428 | eval_gettext "The commit message #\${n} will be skipped:" |
6368f3f8 JS |
429 | } |
430 | ||
a25eb139 | 431 | update_squash_messages () { |
6bb4e485 MZ |
432 | if test -f "$squash_msg"; then |
433 | mv "$squash_msg" "$squash_msg".bak || exit | |
434 | count=$(($(sed -n \ | |
356b8ecf | 435 | -e "1s/^$comment_char[^0-9]*\([0-9][0-9]*\).*/\1/p" \ |
6bb4e485 | 436 | -e "q" < "$squash_msg".bak)+1)) |
bde1a686 | 437 | { |
f2d17068 VA |
438 | printf '%s\n' "$comment_char $(eval_ngettext \ |
439 | "This is a combination of \$count commit." \ | |
440 | "This is a combination of \$count commits." \ | |
441 | $count)" | |
bde1a686 MH |
442 | sed -e 1d -e '2,/^./{ |
443 | /^$/d | |
6bb4e485 MZ |
444 | }' <"$squash_msg".bak |
445 | } >"$squash_msg" | |
6368f3f8 | 446 | else |
acefe2be JH |
447 | commit_message HEAD >"$fixup_msg" || |
448 | die "$(eval_gettext "Cannot write \$fixup_msg")" | |
6bb4e485 | 449 | count=2 |
bde1a686 | 450 | { |
f2d17068 VA |
451 | printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")" |
452 | printf '%s\n' "$comment_char $(gettext "This is the 1st commit message:")" | |
bde1a686 | 453 | echo |
6bb4e485 MZ |
454 | cat "$fixup_msg" |
455 | } >"$squash_msg" | |
6368f3f8 | 456 | fi |
0205e72f MH |
457 | case $1 in |
458 | squash) | |
6bb4e485 | 459 | rm -f "$fixup_msg" |
0205e72f | 460 | echo |
f2d17068 | 461 | printf '%s\n' "$comment_char $(this_nth_commit_message $count)" |
0205e72f | 462 | echo |
ee0a4afb | 463 | commit_message $2 |
0205e72f MH |
464 | ;; |
465 | fixup) | |
466 | echo | |
f2d17068 | 467 | printf '%s\n' "$comment_char $(skip_nth_commit_message $count)" |
0205e72f | 468 | echo |
180bad3d JK |
469 | # Change the space after the comment character to TAB: |
470 | commit_message $2 | git stripspace --comment-lines | sed -e 's/ / /' | |
0205e72f | 471 | ;; |
6bb4e485 | 472 | esac >>"$squash_msg" |
6368f3f8 JS |
473 | } |
474 | ||
475 | peek_next_command () { | |
180bad3d | 476 | git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q |
6368f3f8 JS |
477 | } |
478 | ||
6bdcd0d2 MH |
479 | # A squash/fixup has failed. Prepare the long version of the squash |
480 | # commit message, then die_with_patch. This code path requires the | |
481 | # user to edit the combined commit message for all commits that have | |
482 | # been squashed/fixedup so far. So also erase the old squash | |
483 | # messages, effectively causing the combined commit to be used as the | |
484 | # new basis for any further squash/fixups. Args: sha1 rest | |
485 | die_failed_squash() { | |
9588c52b VA |
486 | sha1=$1 |
487 | rest=$2 | |
6bb4e485 MZ |
488 | mv "$squash_msg" "$msg" || exit |
489 | rm -f "$fixup_msg" | |
490 | cp "$msg" "$GIT_DIR"/MERGE_MSG || exit | |
6bdcd0d2 | 491 | warn |
9588c52b VA |
492 | warn "$(eval_gettext "Could not apply \$sha1... \$rest")" |
493 | die_with_patch $sha1 "" | |
6bdcd0d2 MH |
494 | } |
495 | ||
b079feed | 496 | flush_rewritten_pending() { |
6bb4e485 | 497 | test -s "$rewritten_pending" || return |
b079feed | 498 | newsha1="$(git rev-parse HEAD^0)" |
6bb4e485 MZ |
499 | sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list" |
500 | rm -f "$rewritten_pending" | |
b079feed TR |
501 | } |
502 | ||
503 | record_in_rewritten() { | |
504 | oldsha1="$(git rev-parse $1)" | |
6bb4e485 | 505 | echo "$oldsha1" >> "$rewritten_pending" |
b079feed TR |
506 | |
507 | case "$(peek_next_command)" in | |
41f556b9 | 508 | squash|s|fixup|f) |
b079feed | 509 | ;; |
41f556b9 | 510 | *) |
b079feed TR |
511 | flush_rewritten_pending |
512 | ;; | |
513 | esac | |
514 | } | |
515 | ||
df5df20c | 516 | do_pick () { |
9588c52b VA |
517 | sha1=$1 |
518 | rest=$2 | |
df5df20c CW |
519 | if test "$(git rev-parse HEAD)" = "$squash_onto" |
520 | then | |
521 | # Set the correct commit message and author info on the | |
522 | # sentinel root before cherry-picking the original changes | |
523 | # without committing (-n). Finally, update the sentinel again | |
524 | # to include these changes. If the cherry-pick results in a | |
525 | # conflict, this means our behaviour is similar to a standard | |
526 | # failed cherry-pick during rebase, with a dirty index to | |
527 | # resolve before manually running git commit --amend then git | |
528 | # rebase --continue. | |
529 | git commit --allow-empty --allow-empty-message --amend \ | |
9588c52b VA |
530 | --no-post-rewrite -n -q -C $sha1 && |
531 | pick_one -n $sha1 && | |
df5df20c | 532 | git commit --allow-empty --allow-empty-message \ |
9588c52b | 533 | --amend --no-post-rewrite -n -q -C $sha1 \ |
3ee5e540 | 534 | ${gpg_sign_opt:+"$gpg_sign_opt"} || |
9588c52b | 535 | die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")" |
df5df20c | 536 | else |
9588c52b VA |
537 | pick_one $sha1 || |
538 | die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")" | |
df5df20c CW |
539 | fi |
540 | } | |
541 | ||
1b1dce4b | 542 | do_next () { |
b12d3e90 | 543 | rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha || exit |
6bb4e485 | 544 | read -r command sha1 rest < "$todo" |
1b1dce4b | 545 | case "$command" in |
c9266d58 | 546 | "$comment_char"*|''|noop|drop|d) |
1b1dce4b | 547 | mark_action_done |
1b1dce4b | 548 | ;; |
39743cf5 JH |
549 | "$cr") |
550 | # Work around CR left by "read" (e.g. with Git for Windows' Bash). | |
551 | mark_action_done | |
552 | ;; | |
f8babc4d | 553 | pick|p) |
1b1dce4b JS |
554 | comment_for_reflog pick |
555 | ||
556 | mark_action_done | |
df5df20c | 557 | do_pick $sha1 "$rest" |
b079feed | 558 | record_in_rewritten $sha1 |
1b1dce4b | 559 | ;; |
6741aa6c BG |
560 | reword|r) |
561 | comment_for_reflog reword | |
562 | ||
563 | mark_action_done | |
df5df20c | 564 | do_pick $sha1 "$rest" |
a6c612b5 GS |
565 | git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} \ |
566 | $allow_empty_message || { | |
9588c52b VA |
567 | warn "$(eval_gettext "\ |
568 | Could not amend commit after successfully picking \$sha1... \$rest | |
569 | This is most likely due to an empty commit message, or the pre-commit hook | |
570 | failed. If the pre-commit hook failed, you may need to resolve the issue before | |
571 | you are able to reword the commit.")" | |
0becb3e4 AW |
572 | exit_with_patch $sha1 1 |
573 | } | |
b079feed | 574 | record_in_rewritten $sha1 |
6741aa6c | 575 | ;; |
f8babc4d | 576 | edit|e) |
1b1dce4b JS |
577 | comment_for_reflog edit |
578 | ||
579 | mark_action_done | |
df5df20c | 580 | do_pick $sha1 "$rest" |
14c793e8 | 581 | sha1_abbrev=$(git rev-parse --short $sha1) |
9588c52b | 582 | warn "$(eval_gettext "Stopped at \$sha1_abbrev... \$rest")" |
0becb3e4 | 583 | exit_with_patch $sha1 0 |
1b1dce4b | 584 | ;; |
0205e72f MH |
585 | squash|s|fixup|f) |
586 | case "$command" in | |
587 | squash|s) | |
588 | squash_style=squash | |
589 | ;; | |
590 | fixup|f) | |
591 | squash_style=fixup | |
592 | ;; | |
593 | esac | |
594 | comment_for_reflog $squash_style | |
1b1dce4b | 595 | |
6bb4e485 | 596 | test -f "$done" && has_action "$done" || |
9588c52b | 597 | die "$(eval_gettext "Cannot '\$squash_style' without a previous commit")" |
1b1dce4b JS |
598 | |
599 | mark_action_done | |
a25eb139 | 600 | update_squash_messages $squash_style $sha1 |
6bb4e485 MZ |
601 | author_script_content=$(get_author_ident_from_commit HEAD) |
602 | echo "$author_script_content" > "$author_script" | |
603 | eval "$author_script_content" | |
2147f844 CW |
604 | if ! pick_one -n $sha1 |
605 | then | |
606 | git rev-parse --verify HEAD >"$amend" | |
607 | die_failed_squash $sha1 "$rest" | |
608 | fi | |
6368f3f8 | 609 | case "$(peek_next_command)" in |
0205e72f | 610 | squash|s|fixup|f) |
a25eb139 MH |
611 | # This is an intermediate commit; its message will only be |
612 | # used in case of trouble. So use the long version: | |
3ee5e540 | 613 | do_with_author output git commit --amend --no-verify -F "$squash_msg" \ |
a6c612b5 | 614 | ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message || |
6bdcd0d2 | 615 | die_failed_squash $sha1 "$rest" |
376ccb8c | 616 | ;; |
6368f3f8 | 617 | *) |
a25eb139 | 618 | # This is the final command of this squash/fixup group |
6bb4e485 | 619 | if test -f "$fixup_msg" |
a25eb139 | 620 | then |
3ee5e540 | 621 | do_with_author git commit --amend --no-verify -F "$fixup_msg" \ |
a6c612b5 | 622 | ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message || |
6bdcd0d2 MH |
623 | die_failed_squash $sha1 "$rest" |
624 | else | |
6bb4e485 | 625 | cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit |
6bdcd0d2 | 626 | rm -f "$GIT_DIR"/MERGE_MSG |
3ee5e540 | 627 | do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \ |
a6c612b5 | 628 | ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message || |
6bdcd0d2 | 629 | die_failed_squash $sha1 "$rest" |
a25eb139 | 630 | fi |
6bb4e485 | 631 | rm -f "$squash_msg" "$fixup_msg" |
376ccb8c | 632 | ;; |
6368f3f8 | 633 | esac |
b079feed | 634 | record_in_rewritten $sha1 |
1b1dce4b | 635 | ;; |
cd035b1c | 636 | x|"exec") |
6bb4e485 | 637 | read -r command rest < "$todo" |
cd035b1c | 638 | mark_action_done |
9588c52b | 639 | eval_gettextln "Executing: \$rest" |
fe9394ad | 640 | "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution |
cd035b1c | 641 | status=$? |
1686519a JH |
642 | # Run in subshell because require_clean_work_tree can die. |
643 | dirty=f | |
644 | (require_clean_work_tree "rebase" 2>/dev/null) || dirty=t | |
cd035b1c MM |
645 | if test "$status" -ne 0 |
646 | then | |
9588c52b | 647 | warn "$(eval_gettext "Execution failed: \$rest")" |
1686519a | 648 | test "$dirty" = f || |
9588c52b | 649 | warn "$(gettext "and made changes to the index and/or the working tree")" |
1686519a | 650 | |
9588c52b VA |
651 | warn "$(gettext "\ |
652 | You can fix the problem, and then run | |
653 | ||
654 | git rebase --continue")" | |
cd035b1c | 655 | warn |
ecfe1ea9 JS |
656 | if test $status -eq 127 # command not found |
657 | then | |
658 | status=1 | |
659 | fi | |
cd035b1c | 660 | exit "$status" |
1686519a | 661 | elif test "$dirty" = t |
cd035b1c | 662 | then |
9588c52b VA |
663 | # TRANSLATORS: after these lines is a command to be issued by the user |
664 | warn "$(eval_gettext "\ | |
665 | Execution succeeded: \$rest | |
666 | but left changes to the index and/or the working tree | |
667 | Commit or stash your changes, and then run | |
668 | ||
669 | git rebase --continue")" | |
cd035b1c MM |
670 | warn |
671 | exit 1 | |
672 | fi | |
673 | ;; | |
1b1dce4b | 674 | *) |
9588c52b VA |
675 | warn "$(eval_gettext "Unknown command: \$command \$sha1 \$rest")" |
676 | fixtodo="$(gettext "Please fix this using 'git rebase --edit-todo'.")" | |
f1be316a JK |
677 | if git rev-parse --verify -q "$sha1" >/dev/null |
678 | then | |
9c8e1011 | 679 | die_with_patch $sha1 "$fixtodo" |
f1be316a | 680 | else |
9c8e1011 | 681 | die "$fixtodo" |
f1be316a | 682 | fi |
376ccb8c | 683 | ;; |
1b1dce4b | 684 | esac |
6bb4e485 | 685 | test -s "$todo" && return |
1b1dce4b | 686 | |
68a163c9 | 687 | comment_for_reflog finish && |
6bb4e485 | 688 | newhead=$(git rev-parse HEAD) && |
431b7e78 | 689 | case $head_name in |
73697a0b | 690 | refs/*) |
1af221ef | 691 | message="$GIT_REFLOG_ACTION: $head_name onto $onto" && |
431b7e78 | 692 | git update-ref -m "$message" $head_name $newhead $orig_head && |
53f2ffa8 JK |
693 | git symbolic-ref \ |
694 | -m "$GIT_REFLOG_ACTION: returning to $head_name" \ | |
695 | HEAD $head_name | |
73697a0b JS |
696 | ;; |
697 | esac && { | |
431b7e78 | 698 | test ! -f "$state_dir"/verbose || |
2959c283 | 699 | git diff-tree --stat $orig_head..HEAD |
3df0a859 | 700 | } && |
eb2151bb | 701 | { |
6bb4e485 MZ |
702 | test -s "$rewritten_list" && |
703 | git notes copy --for-rewrite=rebase < "$rewritten_list" || | |
eb2151bb TR |
704 | true # we don't care if this copying failed |
705 | } && | |
b849b954 NTND |
706 | hook="$(git rev-parse --git-path hooks/post-rewrite)" |
707 | if test -x "$hook" && test -s "$rewritten_list"; then | |
708 | "$hook" rebase < "$rewritten_list" | |
b079feed TR |
709 | true # we don't care if this hook failed |
710 | fi && | |
9588c52b | 711 | warn "$(eval_gettext "Successfully rebased and updated \$head_name.")" |
1b1dce4b | 712 | |
15d4bf2e | 713 | return 1 # not failure; just to break the do_rest loop |
1b1dce4b JS |
714 | } |
715 | ||
15d4bf2e | 716 | # can only return 0, when the infinite loop breaks |
1b1dce4b JS |
717 | do_rest () { |
718 | while : | |
719 | do | |
15d4bf2e | 720 | do_next || break |
1b1dce4b | 721 | done |
1b1dce4b JS |
722 | } |
723 | ||
75c69766 | 724 | expand_todo_ids() { |
3546c8d9 | 725 | git rebase--helper --expand-ids |
75c69766 JH |
726 | } |
727 | ||
728 | collapse_todo_ids() { | |
3546c8d9 | 729 | git rebase--helper --shorten-ids |
f59baa50 NS |
730 | } |
731 | ||
37079959 GR |
732 | # Switch to the branch in $into and notify it in the reflog |
733 | checkout_onto () { | |
734 | GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" | |
9588c52b | 735 | output git checkout $onto || die_abort "$(gettext "could not detach HEAD")" |
37079959 GR |
736 | git update-ref ORIG_HEAD $orig_head |
737 | } | |
738 | ||
739 | get_missing_commit_check_level () { | |
740 | check_level=$(git config --get rebase.missingCommitsCheck) | |
741 | check_level=${check_level:-ignore} | |
742 | # Don't be case sensitive | |
743 | printf '%s' "$check_level" | tr 'A-Z' 'a-z' | |
744 | } | |
745 | ||
9f50d32b KM |
746 | # The whole contents of this file is run by dot-sourcing it from |
747 | # inside a shell function. It used to be that "return"s we see | |
748 | # below were not inside any function, and expected to return | |
749 | # to the function that dot-sourced us. | |
750 | # | |
9b35cadc EM |
751 | # However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a |
752 | # construct and continue to run the statements that follow such a "return". | |
9f50d32b KM |
753 | # As a work-around, we introduce an extra layer of a function |
754 | # here, and immediately call it after defining it. | |
755 | git_rebase__interactive () { | |
756 | ||
cf432ca0 MZ |
757 | case "$action" in |
758 | continue) | |
18633e1a JS |
759 | if test ! -d "$rewritten" |
760 | then | |
a6c612b5 GS |
761 | exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \ |
762 | --continue | |
18633e1a | 763 | fi |
cf432ca0 | 764 | # do we have anything to commit? |
a6754cda | 765 | if git diff-index --cached --quiet HEAD -- |
cf432ca0 | 766 | then |
0e0aff4b JS |
767 | # Nothing to commit -- skip this commit |
768 | ||
769 | test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD || | |
770 | rm "$GIT_DIR"/CHERRY_PICK_HEAD || | |
9588c52b | 771 | die "$(gettext "Could not remove CHERRY_PICK_HEAD")" |
cf432ca0 | 772 | else |
ffaaed88 MM |
773 | if ! test -f "$author_script" |
774 | then | |
3ee5e540 | 775 | gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} |
9588c52b VA |
776 | die "$(eval_gettext "\ |
777 | You have staged changes in your working tree. | |
778 | If these changes are meant to be | |
ffaaed88 MM |
779 | squashed into the previous commit, run: |
780 | ||
9588c52b | 781 | git commit --amend \$gpg_sign_opt_quoted |
ffaaed88 MM |
782 | |
783 | If they are meant to go into a new commit, run: | |
784 | ||
9588c52b | 785 | git commit \$gpg_sign_opt_quoted |
ffaaed88 | 786 | |
7c406bd8 | 787 | In both cases, once you're done, continue with: |
ffaaed88 MM |
788 | |
789 | git rebase --continue | |
9588c52b | 790 | ")" |
ffaaed88 | 791 | fi |
cf432ca0 | 792 | . "$author_script" || |
9588c52b | 793 | die "$(gettext "Error trying to find the author identity to amend commit")" |
cf432ca0 | 794 | if test -f "$amend" |
03270628 | 795 | then |
cf432ca0 MZ |
796 | current_head=$(git rev-parse --verify HEAD) |
797 | test "$current_head" = $(cat "$amend") || | |
9588c52b VA |
798 | die "$(gettext "\ |
799 | You have uncommitted changes in your working tree. Please commit them | |
800 | first and then run 'git rebase --continue' again.")" | |
3ee5e540 | 801 | do_with_author git commit --amend --no-verify -F "$msg" -e \ |
a6c612b5 | 802 | ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message || |
9588c52b | 803 | die "$(gettext "Could not commit staged changes.")" |
2147f844 | 804 | else |
3ee5e540 | 805 | do_with_author git commit --no-verify -F "$msg" -e \ |
a6c612b5 | 806 | ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message || |
9588c52b | 807 | die "$(gettext "Could not commit staged changes.")" |
03270628 | 808 | fi |
cf432ca0 | 809 | fi |
18640d99 | 810 | |
b12d3e90 MM |
811 | if test -r "$state_dir"/stopped-sha |
812 | then | |
813 | record_in_rewritten "$(cat "$state_dir"/stopped-sha)" | |
814 | fi | |
0acb62f2 | 815 | |
cf432ca0 MZ |
816 | require_clean_work_tree "rebase" |
817 | do_rest | |
15d4bf2e | 818 | return 0 |
cf432ca0 | 819 | ;; |
cf432ca0 | 820 | skip) |
cf432ca0 | 821 | git rerere clear |
cf432ca0 | 822 | |
18633e1a JS |
823 | if test ! -d "$rewritten" |
824 | then | |
a6c612b5 GS |
825 | exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \ |
826 | --continue | |
18633e1a | 827 | fi |
2959c283 | 828 | do_rest |
15d4bf2e | 829 | return 0 |
cf432ca0 | 830 | ;; |
eb9a7cb4 | 831 | edit-todo) |
180bad3d | 832 | git stripspace --strip-comments <"$todo" >"$todo".new |
eb9a7cb4 | 833 | mv -f "$todo".new "$todo" |
75c69766 | 834 | collapse_todo_ids |
eb9a7cb4 | 835 | append_todo_help |
b8fc9e43 | 836 | gettext " |
180bad3d JK |
837 | You are editing the todo file of an ongoing interactive rebase. |
838 | To continue rebase after editing, run: | |
839 | git rebase --continue | |
840 | ||
b8fc9e43 | 841 | " | git stripspace --comment-lines >>"$todo" |
eb9a7cb4 AW |
842 | |
843 | git_sequence_editor "$todo" || | |
9588c52b | 844 | die "$(gettext "Could not execute editor")" |
75c69766 | 845 | expand_todo_ids |
eb9a7cb4 AW |
846 | |
847 | exit | |
848 | ;; | |
66335298 | 849 | show-current-patch) |
fbd7a232 | 850 | exec git show REBASE_HEAD -- |
66335298 | 851 | ;; |
cf432ca0 | 852 | esac |
1b1dce4b | 853 | |
34262322 MZ |
854 | comment_for_reflog start |
855 | ||
71786f54 | 856 | if test ! -z "$switch_to" |
34262322 | 857 | then |
26cd160c | 858 | GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" |
71786f54 | 859 | output git checkout "$switch_to" -- || |
9588c52b | 860 | die "$(eval_gettext "Could not checkout \$switch_to")" |
26cd160c RR |
861 | |
862 | comment_for_reflog start | |
34262322 MZ |
863 | fi |
864 | ||
9588c52b VA |
865 | orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")" |
866 | mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")" | |
fbd7a232 | 867 | rm -f "$(git rev-parse --git-path REBASE_HEAD)" |
34262322 | 868 | |
9588c52b | 869 | : > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")" |
84df4560 | 870 | write_basic_state |
6bb4e485 | 871 | if test t = "$preserve_merges" |
34262322 | 872 | then |
6bb4e485 | 873 | if test -z "$rebase_root" |
34262322 | 874 | then |
6bb4e485 | 875 | mkdir "$rewritten" && |
431b7e78 | 876 | for c in $(git merge-base --all $orig_head $upstream) |
acc8559a | 877 | do |
6bb4e485 | 878 | echo $onto > "$rewritten"/$c || |
9588c52b | 879 | die "$(gettext "Could not init rewritten commits")" |
acc8559a | 880 | done |
34262322 | 881 | else |
6bb4e485 MZ |
882 | mkdir "$rewritten" && |
883 | echo $onto > "$rewritten"/root || | |
9588c52b | 884 | die "$(gettext "Could not init rewritten commits")" |
34262322 MZ |
885 | fi |
886 | # No cherry-pick because our first pass is to determine | |
887 | # parents to rewrite and skipping dropped commits would | |
888 | # prematurely end our probe | |
6bb4e485 | 889 | merges_option= |
34262322 | 890 | else |
6bb4e485 | 891 | merges_option="--no-merges --cherry-pick" |
34262322 MZ |
892 | fi |
893 | ||
431b7e78 | 894 | shorthead=$(git rev-parse --short $orig_head) |
6bb4e485 MZ |
895 | shortonto=$(git rev-parse --short $onto) |
896 | if test -z "$rebase_root" | |
897 | # this is now equivalent to ! -z "$upstream" | |
34262322 | 898 | then |
6bb4e485 | 899 | shortupstream=$(git rev-parse --short $upstream) |
431b7e78 | 900 | revisions=$upstream...$orig_head |
6bb4e485 | 901 | shortrevisions=$shortupstream..$shorthead |
34262322 | 902 | else |
431b7e78 | 903 | revisions=$onto...$orig_head |
6bb4e485 | 904 | shortrevisions=$shorthead |
34262322 | 905 | fi |
62db5247 JS |
906 | if test t != "$preserve_merges" |
907 | then | |
908 | git rebase--helper --make-script ${keep_empty:+--keep-empty} \ | |
9336281c JS |
909 | $revisions ${restrict_revision+^$restrict_revision} >"$todo" || |
910 | die "$(gettext "Could not generate todo list")" | |
62db5247 JS |
911 | else |
912 | format=$(git config --get rebase.instructionFormat) | |
913 | # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse | |
914 | git rev-list $merges_option --format="%m%H ${format:-%s}" \ | |
915 | --reverse --left-right --topo-order \ | |
916 | $revisions ${restrict_revision+^$restrict_revision} | \ | |
917 | sed -n "s/^>//p" | | |
918 | while read -r sha1 rest | |
919 | do | |
920 | ||
921 | if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1 | |
922 | then | |
923 | comment_out="$comment_char " | |
924 | else | |
925 | comment_out= | |
926 | fi | |
90e1818f | 927 | |
6bb4e485 | 928 | if test -z "$rebase_root" |
acc8559a | 929 | then |
34262322 MZ |
930 | preserve=t |
931 | for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-) | |
acc8559a | 932 | do |
12bf8283 | 933 | if test -f "$rewritten"/$p |
acc8559a | 934 | then |
34262322 | 935 | preserve=f |
acc8559a SH |
936 | fi |
937 | done | |
34262322 MZ |
938 | else |
939 | preserve=f | |
940 | fi | |
941 | if test f = "$preserve" | |
942 | then | |
6bb4e485 | 943 | touch "$rewritten"/$sha1 |
edb72d55 | 944 | printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo" |
acc8559a | 945 | fi |
62db5247 JS |
946 | done |
947 | fi | |
d911d146 | 948 | |
34262322 | 949 | # Watch for commits that been dropped by --cherry-pick |
6bb4e485 | 950 | if test t = "$preserve_merges" |
34262322 | 951 | then |
6bb4e485 | 952 | mkdir "$dropped" |
34262322 | 953 | # Save all non-cherry-picked changes |
6bb4e485 | 954 | git rev-list $revisions --left-right --cherry-pick | \ |
431b7e78 | 955 | sed -n "s/^>//p" > "$state_dir"/not-cherry-picks |
34262322 MZ |
956 | # Now all commits and note which ones are missing in |
957 | # not-cherry-picks and hence being dropped | |
6bb4e485 | 958 | git rev-list $revisions | |
34262322 MZ |
959 | while read rev |
960 | do | |
214123c6 JH |
961 | if test -f "$rewritten"/$rev && |
962 | ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null | |
34262322 MZ |
963 | then |
964 | # Use -f2 because if rev-list is telling us this commit is | |
965 | # not worthwhile, we don't want to track its multiple heads, | |
966 | # just the history of its first-parent for others that will | |
967 | # be rebasing on top of it | |
6bb4e485 | 968 | git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$dropped"/$rev |
edb72d55 KS |
969 | sha1=$(git rev-list -1 $rev) |
970 | sane_grep -v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo" | |
6bb4e485 | 971 | rm "$rewritten"/$rev |
34262322 MZ |
972 | fi |
973 | done | |
974 | fi | |
975 | ||
6bb4e485 | 976 | test -s "$todo" || echo noop >> "$todo" |
c44a4c65 | 977 | test -z "$autosquash" || git rebase--helper --rearrange-squash || exit |
0cce4a27 | 978 | test -n "$cmd" && git rebase--helper --add-exec-commands "$cmd" |
c2145384 | 979 | |
97f05f43 | 980 | todocount=$(git stripspace --strip-comments <"$todo" | wc -l) |
28c8cfc3 | 981 | todocount=${todocount##* } |
97f05f43 | 982 | |
180bad3d | 983 | cat >>"$todo" <<EOF |
6047a234 | 984 | |
b8fc9e43 VA |
985 | $comment_char $(eval_ngettext \ |
986 | "Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \ | |
987 | "Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \ | |
988 | "$todocount") | |
fcc5ef1c AW |
989 | EOF |
990 | append_todo_help | |
b8fc9e43 | 991 | gettext " |
180bad3d JK |
992 | However, if you remove everything, the rebase will be aborted. |
993 | ||
b8fc9e43 | 994 | " | git stripspace --comment-lines >>"$todo" |
1b1dce4b | 995 | |
90e1818f NH |
996 | if test -z "$keep_empty" |
997 | then | |
9588c52b | 998 | printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo" |
90e1818f NH |
999 | fi |
1000 | ||
1001 | ||
6bb4e485 | 1002 | has_action "$todo" || |
e4244eb3 | 1003 | return 2 |
1b1dce4b | 1004 | |
6bb4e485 | 1005 | cp "$todo" "$todo".backup |
edb72d55 | 1006 | collapse_todo_ids |
821881d8 | 1007 | git_sequence_editor "$todo" || |
9588c52b | 1008 | die_abort "$(gettext "Could not execute editor")" |
1b1dce4b | 1009 | |
6bb4e485 | 1010 | has_action "$todo" || |
e4244eb3 | 1011 | return 2 |
c54b7817 | 1012 | |
94399949 JS |
1013 | git rebase--helper --check-todo-list || { |
1014 | ret=$? | |
1015 | checkout_onto | |
1016 | exit $ret | |
1017 | } | |
37079959 | 1018 | |
75c69766 JH |
1019 | expand_todo_ids |
1020 | ||
cdac2b01 JS |
1021 | test -d "$rewritten" || test -n "$force_rebase" || |
1022 | onto="$(git rebase--helper --skip-unnecessary-picks)" || | |
1023 | die "Could not skip unnecessary pick commands" | |
0e757e30 | 1024 | |
37079959 | 1025 | checkout_onto |
18633e1a JS |
1026 | if test -z "$rebase_root" && test ! -d "$rewritten" |
1027 | then | |
1028 | require_clean_work_tree "rebase" | |
a6c612b5 GS |
1029 | exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \ |
1030 | --continue | |
18633e1a | 1031 | fi |
34262322 | 1032 | do_rest |
9f50d32b KM |
1033 | |
1034 | } | |
1035 | # ... and then we call the whole thing. | |
1036 | git_rebase__interactive |