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