blob: c96b9847e9fc2aaf67997c74a8d5c0abe78b607d [file] [log] [blame]
Jonathan Nieder11d62142013-11-25 13:03:52 -08001# 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.
Johannes Schindelin1b1dce42007-06-25 01:11:14 +01004#
5# Copyright (c) 2006 Johannes E. Schindelin
Johannes Schindelin1b1dce42007-06-25 01:11:14 +01006#
7# The original idea comes from Eric W. Biederman, in
8# http://article.gmane.org/gmane.comp.version-control.git/22407
Martin von Zweigbergk572a7c52012-06-26 07:51:54 -07009#
Michael Haggerty80883bb2010-01-14 06:54:45 +010010# 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
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -050013# file and written to the tail of $done.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050014todo="$state_dir"/git-rebase-todo
Michael Haggerty80883bb2010-01-14 06:54:45 +010015
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.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050019done="$state_dir"/done
Michael Haggerty80883bb2010-01-14 06:54:45 +010020
21# The commit message that is planned to be used for any changes that
22# need to be committed following a user interaction.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050023msg="$state_dir"/message
Michael Haggerty80883bb2010-01-14 06:54:45 +010024
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
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -050033# # This is a combination of $count commits.
34# where $count is the number of commits whose messages have been
Michael Haggerty80883bb2010-01-14 06:54:45 +010035# 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.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050038squash_msg="$state_dir"/message-squash
Michael Haggerty80883bb2010-01-14 06:54:45 +010039
Michael Haggertya25eb132010-01-14 06:54:55 +010040# 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.)
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050045fixup_msg="$state_dir"/message-fixup
Michael Haggertya25eb132010-01-14 06:54:55 +010046
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -050047# $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
Michael Haggerty80883bb2010-01-14 06:54:45 +010050# 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.)
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050053rewritten="$state_dir"/rewritten
Michael Haggerty80883bb2010-01-14 06:54:45 +010054
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050055dropped="$state_dir"/dropped
Michael Haggerty0aac0de2010-01-14 06:54:46 +010056
Zoltan Klingerb71dc3e2013-04-25 19:28:54 +100057end="$state_dir"/end
58msgnum="$state_dir"/msgnum
59
Michael Haggerty0aac0de2010-01-14 06:54:46 +010060# 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.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050063author_script="$state_dir"/author-script
Michael Haggerty0aac0de2010-01-14 06:54:46 +010064
Michael Haggertya4049ae2010-01-14 06:54:47 +010065# 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.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050071amend="$state_dir"/amend
Michael Haggertya4049ae2010-01-14 06:54:47 +010072
Thomas Rastb079fee2010-03-12 18:04:30 +010073# 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.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -050077rewritten_list="$state_dir"/rewritten-list
78rewritten_pending="$state_dir"/rewritten-pending
Thomas Rastb079fee2010-03-12 18:04:30 +010079
Arnaud Fontainedb2b3b82013-07-02 17:05:48 +090080strategy_args=
81if test -n "$do_merge"
82then
83 strategy_args=${strategy:+--strategy=$strategy}
84 eval '
85 for strategy_opt in '"$strategy_opts"'
86 do
87 strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
88 done
89 '
90fi
91
Martin von Zweigbergk89c7ae92011-02-06 13:43:49 -050092GIT_CHERRY_PICK_HELP="$resolvemsg"
Wincent Colaiuta804c7172007-11-28 00:06:36 -080093export GIT_CHERRY_PICK_HELP
94
John Keeping180bad32013-02-11 23:08:04 +000095comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1)
96: ${comment_char:=#}
97
Johannes Schindelin1b1dce42007-06-25 01:11:14 +010098warn () {
Brandon Casey938791c2010-07-22 14:15:11 -050099 printf '%s\n' "$*" >&2
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100100}
101
Michael Haggertyee0a4af2010-01-14 06:54:51 +0100102# Output the commit message for the specified commit.
103commit_message () {
104 git cat-file commit "$1" | sed "1,/^$/d"
105}
106
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500107orig_reflog_action="$GIT_REFLOG_ACTION"
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100108
109comment_for_reflog () {
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500110 case "$orig_reflog_action" in
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100111 ''|rebase*)
112 GIT_REFLOG_ACTION="rebase -i ($1)"
113 export GIT_REFLOG_ACTION
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100114 ;;
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100115 esac
116}
117
Junio C Hamano4e673872008-01-14 20:01:21 -0800118last_count=
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100119mark_action_done () {
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500120 sed -e 1q < "$todo" >> "$done"
121 sed -e 1d < "$todo" >> "$todo".new
122 mv -f "$todo".new "$todo"
John Keeping180bad32013-02-11 23:08:04 +0000123 new_count=$(git stripspace --strip-comments <"$done" | wc -l)
Zoltan Klingerb71dc3e2013-04-25 19:28:54 +1000124 echo $new_count >"$msgnum"
John Keeping180bad32013-02-11 23:08:04 +0000125 total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l)))
Zoltan Klingerb71dc3e2013-04-25 19:28:54 +1000126 echo $total >"$end"
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500127 if test "$last_count" != "$new_count"
Junio C Hamano4e673872008-01-14 20:01:21 -0800128 then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500129 last_count=$new_count
130 printf "Rebasing (%d/%d)\r" $new_count $total
131 test -z "$verbose" || echo
Junio C Hamano4e673872008-01-14 20:01:21 -0800132 fi
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100133}
134
Andrew Wongfcc5ef12012-09-17 21:28:08 -0400135append_todo_help () {
John Keeping180bad32013-02-11 23:08:04 +0000136 git stripspace --comment-lines >>"$todo" <<\EOF
137
138Commands:
139 p, pick = use commit
140 r, reword = use commit, but edit the commit message
141 e, edit = use commit, but stop for amending
142 s, squash = use commit, but meld into previous commit
143 f, fixup = like "squash", but discard this commit's log message
144 x, exec = run command (the rest of the line) using shell
145
146These lines can be re-ordered; they are executed from top to bottom.
147
148If you remove a line here THAT COMMIT WILL BE LOST.
Andrew Wongfcc5ef12012-09-17 21:28:08 -0400149EOF
150}
151
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100152make_patch () {
Johannes Schindelin4fb1a192008-12-22 22:16:51 +0100153 sha1_and_parents="$(git rev-list --parents -1 "$1")"
154 case "$sha1_and_parents" in
155 ?*' '?*' '?*)
156 git diff --cc $sha1_and_parents
157 ;;
158 ?*' '?*)
159 git diff-tree -p "$1^!"
160 ;;
161 *)
162 echo "Root commit"
163 ;;
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500164 esac > "$state_dir"/patch
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500165 test -f "$msg" ||
166 commit_message "$1" > "$msg"
167 test -f "$author_script" ||
168 get_author_ident_from_commit "$1" > "$author_script"
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100169}
170
171die_with_patch () {
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500172 echo "$1" > "$state_dir"/stopped-sha
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100173 make_patch "$1"
Johannes Schindelinecfe72f2007-11-22 11:18:10 +0000174 git rerere
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100175 die "$2"
176}
177
Andrew Wong0becb3e2011-11-30 10:52:51 -0500178exit_with_patch () {
179 echo "$1" > "$state_dir"/stopped-sha
180 make_patch $1
181 git rev-parse --verify HEAD > "$amend"
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000182 gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
Andrew Wong0becb3e2011-11-30 10:52:51 -0500183 warn "You can amend the commit now, with"
184 warn
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000185 warn " git commit --amend $gpg_sign_opt_quoted"
Andrew Wong0becb3e2011-11-30 10:52:51 -0500186 warn
187 warn "Once you are satisfied with your changes, run"
188 warn
189 warn " git rebase --continue"
190 warn
191 exit $2
192}
193
Johannes Schindelinc54b7812007-06-25 18:56:55 +0100194die_abort () {
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500195 rm -rf "$state_dir"
Johannes Schindelinc54b7812007-06-25 18:56:55 +0100196 die "$1"
197}
198
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100199has_action () {
John Keeping180bad32013-02-11 23:08:04 +0000200 test -n "$(git stripspace --strip-comments <"$1")"
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100201}
202
Neil Horman90e18182012-04-20 10:36:17 -0400203is_empty_commit() {
204 tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null ||
205 die "$1: not a commit that can be picked")
206 ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null ||
207 ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904)
208 test "$tree" = "$ptree"
209}
210
Phil Hord98697782013-01-12 15:46:01 -0500211is_merge_commit()
212{
213 git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1
214}
215
Michael Haggerty7756ecf2010-01-14 06:54:53 +0100216# Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
217# GIT_AUTHOR_DATE exported from the current environment.
218do_with_author () {
Junio C Hamano76c9c0d2010-01-22 13:09:24 -0800219 (
220 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
221 "$@"
222 )
Michael Haggerty7756ecf2010-01-14 06:54:53 +0100223}
224
Peter Oberndorfer821881d2011-10-17 22:26:23 +0200225git_sequence_editor () {
226 if test -z "$GIT_SEQUENCE_EDITOR"
227 then
228 GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
229 if [ -z "$GIT_SEQUENCE_EDITOR" ]
230 then
231 GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
232 fi
233 fi
234
235 eval "$GIT_SEQUENCE_EDITOR" '"$@"'
236}
237
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100238pick_one () {
Christian Couder8e75abf2010-03-06 21:34:46 +0100239 ff=--ff
Neil Horman90e18182012-04-20 10:36:17 -0400240
Christian Couder8e75abf2010-03-06 21:34:46 +0100241 case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500242 case "$force_rebase" in '') ;; ?*) ff= ;; esac
Johannes Schindelindfa49f32007-07-23 23:45:49 +0100243 output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
Neil Horman90e18182012-04-20 10:36:17 -0400244
245 if is_empty_commit "$sha1"
246 then
247 empty_args="--allow-empty"
248 fi
249
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500250 test -d "$rewritten" &&
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100251 pick_one_preserving_merges "$@" && return
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000252 output eval git cherry-pick \
253 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
254 "$strategy_args" $empty_args $ff "$@"
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100255}
256
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100257pick_one_preserving_merges () {
Thomas Rast71d94512008-08-13 23:41:23 +0200258 fast_forward=t
259 case "$1" in
260 -n)
261 fast_forward=f
262 sha1=$2
263 ;;
264 *)
265 sha1=$1
266 ;;
267 esac
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100268 sha1=$(git rev-parse $sha1)
269
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500270 if test -f "$state_dir"/current-commit
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100271 then
Junio C Hamano4c1360f2008-10-22 11:59:30 -0700272 if test "$fast_forward" = t
Stephen Habermanbb645072008-10-15 02:44:36 -0500273 then
Junio C Hamano41f556b2010-07-05 22:16:15 -0700274 while read current_commit
Stephen Habermanbb645072008-10-15 02:44:36 -0500275 do
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500276 git rev-parse HEAD > "$rewritten"/$current_commit
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500277 done <"$state_dir"/current-commit
278 rm "$state_dir"/current-commit ||
Stephen Habermanbb645072008-10-15 02:44:36 -0500279 die "Cannot write current commit's replacement sha1"
280 fi
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100281 fi
282
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500283 echo $sha1 >> "$state_dir"/current-commit
Thomas Rasta96dc012008-08-13 23:41:24 +0200284
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100285 # rewrite parents; if none were rewritten, we can fast-forward.
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100286 new_parents=
Thomas Rastd911d142009-01-02 23:28:28 +0100287 pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)"
288 if test "$pend" = " "
289 then
290 pend=" root"
291 fi
Stephen Habermanfaae8532008-10-05 23:26:52 -0500292 while [ "$pend" != "" ]
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100293 do
Stephen Habermanfaae8532008-10-05 23:26:52 -0500294 p=$(expr "$pend" : ' \([^ ]*\)')
295 pend="${pend# $p}"
296
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500297 if test -f "$rewritten"/$p
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100298 then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500299 new_p=$(cat "$rewritten"/$p)
Stephen Haberman80fe82e2008-10-15 02:44:40 -0500300
301 # If the todo reordered commits, and our parent is marked for
302 # rewriting, but hasn't been gotten to yet, assume the user meant to
303 # drop it on top of the current HEAD
304 if test -z "$new_p"
305 then
306 new_p=$(git rev-parse HEAD)
307 fi
308
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100309 test $p != $new_p && fast_forward=f
310 case "$new_parents" in
311 *$new_p*)
312 ;; # do nothing; that parent is already there
313 *)
314 new_parents="$new_parents $new_p"
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100315 ;;
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100316 esac
Stephan Beyer1c5fa0a2008-07-16 03:51:49 +0200317 else
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500318 if test -f "$dropped"/$p
Stephen Habermanfaae8532008-10-05 23:26:52 -0500319 then
320 fast_forward=f
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500321 replacement="$(cat "$dropped"/$p)"
Thomas Rastd911d142009-01-02 23:28:28 +0100322 test -z "$replacement" && replacement=root
323 pend=" $replacement$pend"
Stephen Habermanfaae8532008-10-05 23:26:52 -0500324 else
325 new_parents="$new_parents $p"
326 fi
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100327 fi
328 done
329 case $fast_forward in
330 t)
Felipe Contrerasa75d7b52009-10-24 11:31:32 +0300331 output warn "Fast-forward to $sha1"
Thomas Rast71d94512008-08-13 23:41:23 +0200332 output git reset --hard $sha1 ||
Felipe Contrerasa75d7b52009-10-24 11:31:32 +0300333 die "Cannot fast-forward to $sha1"
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100334 ;;
335 f)
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100336 first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
Stephen Habermana4f25e32008-10-15 02:44:37 -0500337
338 if [ "$1" != "-n" ]
339 then
340 # detach HEAD to current parent
341 output git checkout $first_parent 2> /dev/null ||
342 die "Cannot move HEAD to $first_parent"
343 fi
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100344
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100345 case "$new_parents" in
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100346 ' '*' '*)
Stephen Habermana4f25e32008-10-15 02:44:37 -0500347 test "a$1" = a-n && die "Refusing to squash a merge: $sha1"
348
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100349 # redo merge
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500350 author_script_content=$(get_author_ident_from_commit $sha1)
351 eval "$author_script_content"
352 msg_content="$(commit_message $sha1)"
Björn Steinbrinkf91333d2007-10-31 03:20:32 +0100353 # No point in merging the first parent, that's HEAD
354 new_parents=${new_parents# $first_parent}
Ralf Thielowa9f739c2013-08-21 20:48:57 +0200355 merge_args="--no-log --no-ff"
Arnaud Fontainedb2b3b82013-07-02 17:05:48 +0900356 if ! do_with_author output eval \
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000357 'git merge ${gpg_sign_opt:+"$gpg_sign_opt"} \
358 $merge_args $strategy_args -m "$msg_content" $new_parents'
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100359 then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500360 printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
Johannes Sixtf5b49ea2008-12-15 11:05:31 +0100361 die_with_patch $sha1 "Error redoing merge $sha1"
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100362 fi
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500363 echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100364 ;;
365 *)
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000366 output eval git cherry-pick \
367 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
368 "$strategy_args" "$@" ||
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100369 die_with_patch $sha1 "Could not pick $sha1"
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100370 ;;
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100371 esac
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100372 ;;
Johannes Schindelinf09c9b82007-06-25 18:59:43 +0100373 esac
374}
375
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100376nth_string () {
377 case "$1" in
378 *1[0-9]|*[04-9]) echo "$1"th;;
379 *1) echo "$1"st;;
380 *2) echo "$1"nd;;
381 *3) echo "$1"rd;;
382 esac
383}
384
Michael Haggertya25eb132010-01-14 06:54:55 +0100385update_squash_messages () {
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500386 if test -f "$squash_msg"; then
387 mv "$squash_msg" "$squash_msg".bak || exit
388 count=$(($(sed -n \
John Keeping180bad32013-02-11 23:08:04 +0000389 -e "1s/^. This is a combination of \(.*\) commits\./\1/p" \
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500390 -e "q" < "$squash_msg".bak)+1))
Michael Haggertybde1a682010-01-14 06:54:54 +0100391 {
John Keeping180bad32013-02-11 23:08:04 +0000392 printf '%s\n' "$comment_char This is a combination of $count commits."
Michael Haggertybde1a682010-01-14 06:54:54 +0100393 sed -e 1d -e '2,/^./{
394 /^$/d
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500395 }' <"$squash_msg".bak
396 } >"$squash_msg"
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100397 else
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500398 commit_message HEAD > "$fixup_msg" || die "Cannot write $fixup_msg"
399 count=2
Michael Haggertybde1a682010-01-14 06:54:54 +0100400 {
John Keeping180bad32013-02-11 23:08:04 +0000401 printf '%s\n' "$comment_char This is a combination of 2 commits."
402 printf '%s\n' "$comment_char The first commit's message is:"
Michael Haggertybde1a682010-01-14 06:54:54 +0100403 echo
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500404 cat "$fixup_msg"
405 } >"$squash_msg"
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100406 fi
Michael Haggerty0205e722009-12-07 10:20:59 +0100407 case $1 in
408 squash)
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500409 rm -f "$fixup_msg"
Michael Haggerty0205e722009-12-07 10:20:59 +0100410 echo
John Keeping180bad32013-02-11 23:08:04 +0000411 printf '%s\n' "$comment_char This is the $(nth_string $count) commit message:"
Michael Haggerty0205e722009-12-07 10:20:59 +0100412 echo
Michael Haggertyee0a4af2010-01-14 06:54:51 +0100413 commit_message $2
Michael Haggerty0205e722009-12-07 10:20:59 +0100414 ;;
415 fixup)
416 echo
John Keeping180bad32013-02-11 23:08:04 +0000417 printf '%s\n' "$comment_char The $(nth_string $count) commit message will be skipped:"
Michael Haggerty0205e722009-12-07 10:20:59 +0100418 echo
John Keeping180bad32013-02-11 23:08:04 +0000419 # Change the space after the comment character to TAB:
420 commit_message $2 | git stripspace --comment-lines | sed -e 's/ / /'
Michael Haggerty0205e722009-12-07 10:20:59 +0100421 ;;
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500422 esac >>"$squash_msg"
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100423}
424
425peek_next_command () {
John Keeping180bad32013-02-11 23:08:04 +0000426 git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100427}
428
Michael Haggerty6bdcd0d2010-01-14 06:54:57 +0100429# A squash/fixup has failed. Prepare the long version of the squash
430# commit message, then die_with_patch. This code path requires the
431# user to edit the combined commit message for all commits that have
432# been squashed/fixedup so far. So also erase the old squash
433# messages, effectively causing the combined commit to be used as the
434# new basis for any further squash/fixups. Args: sha1 rest
435die_failed_squash() {
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500436 mv "$squash_msg" "$msg" || exit
437 rm -f "$fixup_msg"
438 cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
Michael Haggerty6bdcd0d2010-01-14 06:54:57 +0100439 warn
440 warn "Could not apply $1... $2"
441 die_with_patch $1 ""
442}
443
Thomas Rastb079fee2010-03-12 18:04:30 +0100444flush_rewritten_pending() {
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500445 test -s "$rewritten_pending" || return
Thomas Rastb079fee2010-03-12 18:04:30 +0100446 newsha1="$(git rev-parse HEAD^0)"
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500447 sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list"
448 rm -f "$rewritten_pending"
Thomas Rastb079fee2010-03-12 18:04:30 +0100449}
450
451record_in_rewritten() {
452 oldsha1="$(git rev-parse $1)"
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500453 echo "$oldsha1" >> "$rewritten_pending"
Thomas Rastb079fee2010-03-12 18:04:30 +0100454
455 case "$(peek_next_command)" in
Junio C Hamano41f556b2010-07-05 22:16:15 -0700456 squash|s|fixup|f)
Thomas Rastb079fee2010-03-12 18:04:30 +0100457 ;;
Junio C Hamano41f556b2010-07-05 22:16:15 -0700458 *)
Thomas Rastb079fee2010-03-12 18:04:30 +0100459 flush_rewritten_pending
460 ;;
461 esac
462}
463
Chris Webbdf5df202012-06-26 22:55:23 +0100464do_pick () {
465 if test "$(git rev-parse HEAD)" = "$squash_onto"
466 then
467 # Set the correct commit message and author info on the
468 # sentinel root before cherry-picking the original changes
469 # without committing (-n). Finally, update the sentinel again
470 # to include these changes. If the cherry-pick results in a
471 # conflict, this means our behaviour is similar to a standard
472 # failed cherry-pick during rebase, with a dirty index to
473 # resolve before manually running git commit --amend then git
474 # rebase --continue.
475 git commit --allow-empty --allow-empty-message --amend \
476 --no-post-rewrite -n -q -C $1 &&
477 pick_one -n $1 &&
478 git commit --allow-empty --allow-empty-message \
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000479 --amend --no-post-rewrite -n -q -C $1 \
480 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
Chris Webbdf5df202012-06-26 22:55:23 +0100481 die_with_patch $1 "Could not apply $1... $2"
482 else
483 pick_one $1 ||
484 die_with_patch $1 "Could not apply $1... $2"
485 fi
486}
487
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100488do_next () {
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500489 rm -f "$msg" "$author_script" "$amend" || exit
490 read -r command sha1 rest < "$todo"
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100491 case "$command" in
John Keeping180bad32013-02-11 23:08:04 +0000492 "$comment_char"*|''|noop)
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100493 mark_action_done
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100494 ;;
Johannes Schindelinf8babc42007-09-29 03:32:11 +0100495 pick|p)
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100496 comment_for_reflog pick
497
498 mark_action_done
Chris Webbdf5df202012-06-26 22:55:23 +0100499 do_pick $sha1 "$rest"
Thomas Rastb079fee2010-03-12 18:04:30 +0100500 record_in_rewritten $sha1
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100501 ;;
Björn Gustavsson6741aa62009-10-07 08:13:23 +0200502 reword|r)
503 comment_for_reflog reword
504
505 mark_action_done
Chris Webbdf5df202012-06-26 22:55:23 +0100506 do_pick $sha1 "$rest"
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000507 git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} || {
Andrew Wong0becb3e2011-11-30 10:52:51 -0500508 warn "Could not amend commit after successfully picking $sha1... $rest"
509 warn "This is most likely due to an empty commit message, or the pre-commit hook"
510 warn "failed. If the pre-commit hook failed, you may need to resolve the issue before"
511 warn "you are able to reword the commit."
512 exit_with_patch $sha1 1
513 }
Thomas Rastb079fee2010-03-12 18:04:30 +0100514 record_in_rewritten $sha1
Björn Gustavsson6741aa62009-10-07 08:13:23 +0200515 ;;
Johannes Schindelinf8babc42007-09-29 03:32:11 +0100516 edit|e)
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100517 comment_for_reflog edit
518
519 mark_action_done
Chris Webbdf5df202012-06-26 22:55:23 +0100520 do_pick $sha1 "$rest"
Johannes Sixta8ccc202008-07-23 09:46:35 +0200521 warn "Stopped at $sha1... $rest"
Andrew Wong0becb3e2011-11-30 10:52:51 -0500522 exit_with_patch $sha1 0
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100523 ;;
Michael Haggerty0205e722009-12-07 10:20:59 +0100524 squash|s|fixup|f)
525 case "$command" in
526 squash|s)
527 squash_style=squash
528 ;;
529 fixup|f)
530 squash_style=fixup
531 ;;
532 esac
533 comment_for_reflog $squash_style
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100534
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500535 test -f "$done" && has_action "$done" ||
Michael Haggerty0205e722009-12-07 10:20:59 +0100536 die "Cannot '$squash_style' without a previous commit"
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100537
538 mark_action_done
Michael Haggertya25eb132010-01-14 06:54:55 +0100539 update_squash_messages $squash_style $sha1
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500540 author_script_content=$(get_author_ident_from_commit HEAD)
541 echo "$author_script_content" > "$author_script"
542 eval "$author_script_content"
Chris Webb2147f842012-07-24 13:17:03 +0100543 if ! pick_one -n $sha1
544 then
545 git rev-parse --verify HEAD >"$amend"
546 die_failed_squash $sha1 "$rest"
547 fi
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100548 case "$(peek_next_command)" in
Michael Haggerty0205e722009-12-07 10:20:59 +0100549 squash|s|fixup|f)
Michael Haggertya25eb132010-01-14 06:54:55 +0100550 # This is an intermediate commit; its message will only be
551 # used in case of trouble. So use the long version:
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000552 do_with_author output git commit --amend --no-verify -F "$squash_msg" \
553 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
Michael Haggerty6bdcd0d2010-01-14 06:54:57 +0100554 die_failed_squash $sha1 "$rest"
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100555 ;;
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100556 *)
Michael Haggertya25eb132010-01-14 06:54:55 +0100557 # This is the final command of this squash/fixup group
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500558 if test -f "$fixup_msg"
Michael Haggertya25eb132010-01-14 06:54:55 +0100559 then
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000560 do_with_author git commit --amend --no-verify -F "$fixup_msg" \
561 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
Michael Haggerty6bdcd0d2010-01-14 06:54:57 +0100562 die_failed_squash $sha1 "$rest"
563 else
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500564 cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit
Michael Haggerty6bdcd0d2010-01-14 06:54:57 +0100565 rm -f "$GIT_DIR"/MERGE_MSG
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000566 do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \
567 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
Michael Haggerty6bdcd0d2010-01-14 06:54:57 +0100568 die_failed_squash $sha1 "$rest"
Michael Haggertya25eb132010-01-14 06:54:55 +0100569 fi
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500570 rm -f "$squash_msg" "$fixup_msg"
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100571 ;;
Johannes Schindelin6368f3f2007-07-21 18:09:41 +0100572 esac
Thomas Rastb079fee2010-03-12 18:04:30 +0100573 record_in_rewritten $sha1
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100574 ;;
Matthieu Moycd035b12010-08-10 17:17:51 +0200575 x|"exec")
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500576 read -r command rest < "$todo"
Matthieu Moycd035b12010-08-10 17:17:51 +0200577 mark_action_done
578 printf 'Executing: %s\n' "$rest"
579 # "exec" command doesn't take a sha1 in the todo-list.
580 # => can't just use $sha1 here.
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500581 git rev-parse --verify HEAD > "$state_dir"/stopped-sha
Matthieu Moycd035b12010-08-10 17:17:51 +0200582 ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution
583 status=$?
Junio C Hamano16865192011-08-24 11:54:50 -0700584 # Run in subshell because require_clean_work_tree can die.
585 dirty=f
586 (require_clean_work_tree "rebase" 2>/dev/null) || dirty=t
Matthieu Moycd035b12010-08-10 17:17:51 +0200587 if test "$status" -ne 0
588 then
589 warn "Execution failed: $rest"
Junio C Hamano16865192011-08-24 11:54:50 -0700590 test "$dirty" = f ||
591 warn "and made changes to the index and/or the working tree"
592
Matthieu Moycd035b12010-08-10 17:17:51 +0200593 warn "You can fix the problem, and then run"
594 warn
595 warn " git rebase --continue"
596 warn
Johannes Sixtecfe1ea2012-09-18 13:15:26 +0200597 if test $status -eq 127 # command not found
598 then
599 status=1
600 fi
Matthieu Moycd035b12010-08-10 17:17:51 +0200601 exit "$status"
Junio C Hamano16865192011-08-24 11:54:50 -0700602 elif test "$dirty" = t
Matthieu Moycd035b12010-08-10 17:17:51 +0200603 then
Junio C Hamano16865192011-08-24 11:54:50 -0700604 warn "Execution succeeded: $rest"
605 warn "but left changes to the index and/or the working tree"
Matthieu Moycd035b12010-08-10 17:17:51 +0200606 warn "Commit or stash your changes, and then run"
607 warn
608 warn " git rebase --continue"
609 warn
610 exit 1
611 fi
612 ;;
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100613 *)
614 warn "Unknown command: $command $sha1 $rest"
Johannes Sixt9c8e1012012-09-19 08:43:54 +0200615 fixtodo="Please fix this using 'git rebase --edit-todo'."
Jan Krügerf1be3162009-10-27 15:58:14 +0100616 if git rev-parse --verify -q "$sha1" >/dev/null
617 then
Johannes Sixt9c8e1012012-09-19 08:43:54 +0200618 die_with_patch $sha1 "$fixtodo"
Jan Krügerf1be3162009-10-27 15:58:14 +0100619 else
Johannes Sixt9c8e1012012-09-19 08:43:54 +0200620 die "$fixtodo"
Jan Krügerf1be3162009-10-27 15:58:14 +0100621 fi
Johannes Schindelin376ccb82007-09-25 16:42:51 +0100622 ;;
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100623 esac
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500624 test -s "$todo" && return
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100625
Johannes Schindelin68a163c2007-06-25 18:58:28 +0100626 comment_for_reflog finish &&
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500627 newhead=$(git rev-parse HEAD) &&
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500628 case $head_name in
Johannes Schindelin73697a02007-09-25 16:43:15 +0100629 refs/*)
Michael J Gruber1af221e2012-08-10 08:51:19 +0200630 message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500631 git update-ref -m "$message" $head_name $newhead $orig_head &&
Jeff King53f2ffa2011-05-27 16:16:14 -0400632 git symbolic-ref \
633 -m "$GIT_REFLOG_ACTION: returning to $head_name" \
634 HEAD $head_name
Johannes Schindelin73697a02007-09-25 16:43:15 +0100635 ;;
636 esac && {
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500637 test ! -f "$state_dir"/verbose ||
Martin von Zweigbergk2959c282011-02-06 13:43:52 -0500638 git diff-tree --stat $orig_head..HEAD
Johannes Schindelin3df0a852007-07-08 03:02:13 +0100639 } &&
Thomas Rasteb2151b2010-03-12 18:04:33 +0100640 {
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500641 test -s "$rewritten_list" &&
642 git notes copy --for-rewrite=rebase < "$rewritten_list" ||
Thomas Rasteb2151b2010-03-12 18:04:33 +0100643 true # we don't care if this copying failed
644 } &&
Thomas Rastb079fee2010-03-12 18:04:30 +0100645 if test -x "$GIT_DIR"/hooks/post-rewrite &&
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500646 test -s "$rewritten_list"; then
647 "$GIT_DIR"/hooks/post-rewrite rebase < "$rewritten_list"
Thomas Rastb079fee2010-03-12 18:04:30 +0100648 true # we don't care if this hook failed
649 fi &&
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500650 warn "Successfully rebased and updated $head_name."
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100651
Ramkumar Ramachandra15d4bf22013-05-12 17:26:39 +0530652 return 1 # not failure; just to break the do_rest loop
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100653}
654
Ramkumar Ramachandra15d4bf22013-05-12 17:26:39 +0530655# can only return 0, when the infinite loop breaks
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100656do_rest () {
657 while :
658 do
Ramkumar Ramachandra15d4bf22013-05-12 17:26:39 +0530659 do_next || break
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100660 done
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100661}
662
Johannes Schindelin0e757e32009-03-03 10:55:31 +0100663# skip picking commits whose parents are unchanged
664skip_unnecessary_picks () {
665 fd=3
Brandon Casey2d6ca6e2010-08-13 15:47:34 -0500666 while read -r command rest
Johannes Schindelin0e757e32009-03-03 10:55:31 +0100667 do
668 # fd=3 means we skip the command
Brandon Casey2d6ca6e2010-08-13 15:47:34 -0500669 case "$fd,$command" in
670 3,pick|3,p)
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500671 # pick a commit whose parent is current $onto -> skip
Chris Johnsen14d87292010-09-17 16:42:51 -0500672 sha1=${rest%% *}
Brandon Casey2d6ca6e2010-08-13 15:47:34 -0500673 case "$(git rev-parse --verify --quiet "$sha1"^)" in
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500674 "$onto"*)
675 onto=$sha1
Brandon Casey2d6ca6e2010-08-13 15:47:34 -0500676 ;;
677 *)
678 fd=1
679 ;;
680 esac
Johannes Schindelin0e757e32009-03-03 10:55:31 +0100681 ;;
Eric Sunshine7bca7af2013-08-16 17:44:07 -0400682 3,"$comment_char"*|3,)
Johannes Schindelin0e757e32009-03-03 10:55:31 +0100683 # copy comments
684 ;;
685 *)
686 fd=1
687 ;;
688 esac
Brandon Caseyd1c3b102010-08-13 15:47:35 -0500689 printf '%s\n' "$command${rest:+ }$rest" >&$fd
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500690 done <"$todo" >"$todo.new" 3>>"$done" &&
691 mv -f "$todo".new "$todo" &&
Thomas Rastb079fee2010-03-12 18:04:30 +0100692 case "$(peek_next_command)" in
693 squash|s|fixup|f)
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500694 record_in_rewritten "$onto"
Thomas Rastb079fee2010-03-12 18:04:30 +0100695 ;;
696 esac ||
Johannes Schindelin0e757e32009-03-03 10:55:31 +0100697 die "Could not skip unnecessary pick commands"
698}
699
Junio C Hamano75c69762013-08-23 20:10:42 -0400700transform_todo_ids () {
701 while read -r command rest
702 do
703 case "$command" in
704 "$comment_char"* | exec)
705 # Be careful for oddball commands like 'exec'
706 # that do not have a SHA-1 at the beginning of $rest.
707 ;;
708 *)
709 sha1=$(git rev-parse --verify --quiet "$@" ${rest%% *}) &&
710 rest="$sha1 ${rest#* }"
711 ;;
712 esac
713 printf '%s\n' "$command${rest:+ }$rest"
714 done <"$todo" >"$todo.new" &&
715 mv -f "$todo.new" "$todo"
716}
717
718expand_todo_ids() {
719 transform_todo_ids
720}
721
722collapse_todo_ids() {
Kirill A. Shutemov56895032013-09-28 18:53:05 +0300723 transform_todo_ids --short
Junio C Hamano75c69762013-08-23 20:10:42 -0400724}
725
Nanako Shiraishif59baa52009-12-08 12:13:14 +0900726# Rearrange the todo list that has both "pick sha1 msg" and
727# "pick sha1 fixup!/squash! msg" appears in it so that the latter
728# comes immediately after the former, and change "pick" to
729# "fixup"/"squash".
730rearrange_squash () {
Kevin Ballard68d5d032010-11-04 15:36:32 -0700731 # extract fixup!/squash! lines and resolve any referenced sha1's
732 while read -r pick sha1 message
733 do
734 case "$message" in
735 "squash! "*|"fixup! "*)
736 action="${message%%!*}"
Andrew Pimlott22c5b132013-06-27 12:26:31 -0700737 rest=$message
738 prefix=
739 # skip all squash! or fixup! (but save for later)
740 while :
741 do
742 case "$rest" in
743 "squash! "*|"fixup! "*)
744 prefix="$prefix${rest%%!*},"
745 rest="${rest#*! }"
746 ;;
747 *)
748 break
749 ;;
750 esac
751 done
Uwe Storbeck47be0662014-03-15 00:56:43 +0100752 printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest"
Kevin Ballard68d5d032010-11-04 15:36:32 -0700753 # if it's a single word, try to resolve to a full sha1 and
754 # emit a second copy. This allows us to match on both message
755 # and on sha1 prefix
756 if test "${rest#* }" = "$rest"; then
757 fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)"
758 if test -n "$fullsha"; then
759 # prefix the action to uniquely identify this line as
760 # intended for full sha1 match
Andrew Pimlott22c5b132013-06-27 12:26:31 -0700761 echo "$sha1 +$action $prefix $fullsha"
Kevin Ballard68d5d032010-11-04 15:36:32 -0700762 fi
763 fi
764 esac
765 done >"$1.sq" <"$1"
Nanako Shiraishif59baa52009-12-08 12:13:14 +0900766 test -s "$1.sq" || return
767
768 used=
Junio C Hamano57f2b6b2010-07-05 23:08:36 -0700769 while read -r pick sha1 message
Nanako Shiraishif59baa52009-12-08 12:13:14 +0900770 do
771 case " $used" in
772 *" $sha1 "*) continue ;;
773 esac
Brandon Casey938791c2010-07-22 14:15:11 -0500774 printf '%s\n' "$pick $sha1 $message"
Kevin Ballardd3d7a422010-11-04 15:36:31 -0700775 used="$used$sha1 "
Andrew Pimlott22c5b132013-06-27 12:26:31 -0700776 while read -r squash action msg_prefix msg_content
Nanako Shiraishif59baa52009-12-08 12:13:14 +0900777 do
Kevin Ballardd3d7a422010-11-04 15:36:31 -0700778 case " $used" in
779 *" $squash "*) continue ;;
780 esac
Kevin Ballard68d5d032010-11-04 15:36:32 -0700781 emit=0
782 case "$action" in
783 +*)
784 action="${action#+}"
785 # full sha1 prefix test
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500786 case "$msg_content" in "$sha1"*) emit=1;; esac ;;
Kevin Ballard68d5d032010-11-04 15:36:32 -0700787 *)
788 # message prefix test
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500789 case "$message" in "$msg_content"*) emit=1;; esac ;;
Kevin Ballard68d5d032010-11-04 15:36:32 -0700790 esac
791 if test $emit = 1; then
Andrew Pimlott22c5b132013-06-27 12:26:31 -0700792 real_prefix=$(echo "$msg_prefix" | sed "s/,/! /g")
793 printf '%s\n' "$action $squash ${real_prefix}$msg_content"
Nanako Shiraishif59baa52009-12-08 12:13:14 +0900794 used="$used$squash "
Kevin Ballard68d5d032010-11-04 15:36:32 -0700795 fi
Nanako Shiraishif59baa52009-12-08 12:13:14 +0900796 done <"$1.sq"
797 done >"$1.rearranged" <"$1"
798 cat "$1.rearranged" >"$1"
799 rm -f "$1.sq" "$1.rearranged"
800}
801
Lucien Kongc2145382012-06-12 10:05:12 +0200802# Add commands after a pick or after a squash/fixup serie
803# in the todo list.
804add_exec_commands () {
805 {
806 first=t
807 while read -r insn rest
808 do
809 case $insn in
810 pick)
811 test -n "$first" ||
812 printf "%s" "$cmd"
813 ;;
814 esac
815 printf "%s %s\n" "$insn" "$rest"
816 first=
817 done
818 printf "%s" "$cmd"
819 } <"$1" >"$1.new" &&
820 mv "$1.new" "$1"
821}
822
Kyle J. McKay9f50d322014-04-11 01:28:17 -0700823# The whole contents of this file is run by dot-sourcing it from
824# inside a shell function. It used to be that "return"s we see
825# below were not inside any function, and expected to return
826# to the function that dot-sourced us.
827#
828# However, FreeBSD /bin/sh misbehaves on such a construct and
829# continues to run the statements that follow such a "return".
830# As a work-around, we introduce an extra layer of a function
831# here, and immediately call it after defining it.
832git_rebase__interactive () {
833
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500834case "$action" in
835continue)
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500836 # do we have anything to commit?
John Keepinga6754cd2012-04-07 11:20:53 +0100837 if git diff-index --cached --quiet HEAD --
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500838 then
839 : Nothing to commit -- skip this
840 else
Matthieu Moyffaaed82011-08-24 16:01:48 +0200841 if ! test -f "$author_script"
842 then
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000843 gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
Matthieu Moyffaaed82011-08-24 16:01:48 +0200844 die "You have staged changes in your working tree. If these changes are meant to be
845squashed into the previous commit, run:
846
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000847 git commit --amend $gpg_sign_opt_quoted
Matthieu Moyffaaed82011-08-24 16:01:48 +0200848
849If they are meant to go into a new commit, run:
850
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000851 git commit $gpg_sign_opt_quoted
Matthieu Moyffaaed82011-08-24 16:01:48 +0200852
853In both case, once you're done, continue with:
854
855 git rebase --continue
856"
857 fi
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500858 . "$author_script" ||
Matthieu Moyffaaed82011-08-24 16:01:48 +0200859 die "Error trying to find the author identity to amend commit"
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500860 if test -f "$amend"
Shawn O. Pearce03270622007-12-20 02:12:12 -0500861 then
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500862 current_head=$(git rev-parse --verify HEAD)
863 test "$current_head" = $(cat "$amend") ||
864 die "\
Dmitry Potapovc14c3c82008-09-09 16:05:26 +0400865You have uncommitted changes in your working tree. Please, commit them
866first and then run 'git rebase --continue' again."
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000867 do_with_author git commit --amend --no-verify -F "$msg" -e \
868 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
Chris Webb2147f842012-07-24 13:17:03 +0100869 die "Could not commit staged changes."
870 else
Nicolas Vigier3ee5e542014-02-10 01:03:37 +0000871 do_with_author git commit --no-verify -F "$msg" -e \
872 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
Chris Webb2147f842012-07-24 13:17:03 +0100873 die "Could not commit staged changes."
Shawn O. Pearce03270622007-12-20 02:12:12 -0500874 fi
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500875 fi
Johannes Schindelin18640d92007-07-08 03:01:29 +0100876
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500877 record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
Thomas Rast0acb62f2010-03-28 21:36:00 +0200878
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500879 require_clean_work_tree "rebase"
880 do_rest
Ramkumar Ramachandra15d4bf22013-05-12 17:26:39 +0530881 return 0
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500882 ;;
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500883skip)
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500884 git rerere clear
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100885
Martin von Zweigbergk2959c282011-02-06 13:43:52 -0500886 do_rest
Ramkumar Ramachandra15d4bf22013-05-12 17:26:39 +0530887 return 0
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500888 ;;
Andrew Wongeb9a7cb2012-09-17 21:28:09 -0400889edit-todo)
John Keeping180bad32013-02-11 23:08:04 +0000890 git stripspace --strip-comments <"$todo" >"$todo".new
Andrew Wongeb9a7cb2012-09-17 21:28:09 -0400891 mv -f "$todo".new "$todo"
Junio C Hamano75c69762013-08-23 20:10:42 -0400892 collapse_todo_ids
Andrew Wongeb9a7cb2012-09-17 21:28:09 -0400893 append_todo_help
John Keeping180bad32013-02-11 23:08:04 +0000894 git stripspace --comment-lines >>"$todo" <<\EOF
895
896You are editing the todo file of an ongoing interactive rebase.
897To continue rebase after editing, run:
898 git rebase --continue
899
Andrew Wongeb9a7cb2012-09-17 21:28:09 -0400900EOF
901
902 git_sequence_editor "$todo" ||
903 die "Could not execute editor"
Junio C Hamano75c69762013-08-23 20:10:42 -0400904 expand_todo_ids
Andrew Wongeb9a7cb2012-09-17 21:28:09 -0400905
906 exit
907 ;;
Martin von Zweigbergkcf432ca2011-02-06 13:43:39 -0500908esac
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100909
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500910git var GIT_COMMITTER_IDENT >/dev/null ||
911 die "You need to set your committer info first"
Thomas Rastd8fab022009-01-02 23:28:26 +0100912
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500913comment_for_reflog start
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100914
Martin von Zweigbergk71786f52011-02-06 13:43:42 -0500915if test ! -z "$switch_to"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500916then
Ramkumar Ramachandra26cd1602013-06-16 14:15:13 +0530917 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
Martin von Zweigbergk71786f52011-02-06 13:43:42 -0500918 output git checkout "$switch_to" -- ||
Ramkumar Ramachandra26cd1602013-06-16 14:15:13 +0530919 die "Could not checkout $switch_to"
920
921 comment_for_reflog start
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500922fi
Matt Kraai51668102007-09-25 18:30:13 -0700923
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500924orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?"
Ramkumar Ramachandra1224f3d2013-05-12 17:26:36 +0530925mkdir -p "$state_dir" || die "Could not create temporary $state_dir"
Johannes Schindelin1b1dce42007-06-25 01:11:14 +0100926
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500927: > "$state_dir"/interactive || die "Could not mark as interactive"
Martin von Zweigbergk84df4562011-02-06 13:43:53 -0500928write_basic_state
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500929if test t = "$preserve_merges"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500930then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500931 if test -z "$rebase_root"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500932 then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500933 mkdir "$rewritten" &&
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500934 for c in $(git merge-base --all $orig_head $upstream)
Stephen Habermanacc85592008-10-15 02:44:38 -0500935 do
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500936 echo $onto > "$rewritten"/$c ||
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500937 die "Could not init rewritten commits"
938 done
939 else
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500940 mkdir "$rewritten" &&
941 echo $onto > "$rewritten"/root ||
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500942 die "Could not init rewritten commits"
943 fi
944 # No cherry-pick because our first pass is to determine
945 # parents to rewrite and skipping dropped commits would
946 # prematurely end our probe
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500947 merges_option=
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500948else
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500949 merges_option="--no-merges --cherry-pick"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500950fi
951
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500952shorthead=$(git rev-parse --short $orig_head)
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500953shortonto=$(git rev-parse --short $onto)
954if test -z "$rebase_root"
955 # this is now equivalent to ! -z "$upstream"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500956then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500957 shortupstream=$(git rev-parse --short $upstream)
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500958 revisions=$upstream...$orig_head
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500959 shortrevisions=$shortupstream..$shorthead
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500960else
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -0500961 revisions=$onto...$orig_head
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500962 shortrevisions=$shorthead
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500963fi
Kirill A. Shutemovedb72d52015-01-22 13:50:15 +0200964git rev-list $merges_option --pretty=oneline --reverse --left-right --topo-order \
John Keeping1e0dacd2014-07-16 20:23:49 +0100965 $revisions ${restrict_revision+^$restrict_revision} | \
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500966 sed -n "s/^>//p" |
Kirill A. Shutemovedb72d52015-01-22 13:50:15 +0200967while read -r sha1 rest
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500968do
Neil Horman90e18182012-04-20 10:36:17 -0400969
Kirill A. Shutemovedb72d52015-01-22 13:50:15 +0200970 if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
Neil Horman90e18182012-04-20 10:36:17 -0400971 then
John Keeping180bad32013-02-11 23:08:04 +0000972 comment_out="$comment_char "
Neil Horman90e18182012-04-20 10:36:17 -0400973 else
974 comment_out=
975 fi
976
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500977 if test t != "$preserve_merges"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500978 then
Kirill A. Shutemovedb72d52015-01-22 13:50:15 +0200979 printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500980 else
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500981 if test -z "$rebase_root"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500982 then
983 preserve=t
984 for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
985 do
Andrew Wong12bf8282011-06-18 18:12:01 -0400986 if test -f "$rewritten"/$p
Thomas Rastd911d142009-01-02 23:28:28 +0100987 then
Thomas Rastd911d142009-01-02 23:28:28 +0100988 preserve=f
989 fi
Stephen Habermanacc85592008-10-15 02:44:38 -0500990 done
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500991 else
992 preserve=f
Stephen Habermanacc85592008-10-15 02:44:38 -0500993 fi
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500994 if test f = "$preserve"
995 then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -0500996 touch "$rewritten"/$sha1
Kirill A. Shutemovedb72d52015-01-22 13:50:15 +0200997 printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
Martin von Zweigbergk34262322011-02-06 13:43:35 -0500998 fi
999 fi
1000done
Thomas Rastd911d142009-01-02 23:28:28 +01001001
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001002# Watch for commits that been dropped by --cherry-pick
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001003if test t = "$preserve_merges"
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001004then
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001005 mkdir "$dropped"
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001006 # Save all non-cherry-picked changes
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001007 git rev-list $revisions --left-right --cherry-pick | \
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -05001008 sed -n "s/^>//p" > "$state_dir"/not-cherry-picks
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001009 # Now all commits and note which ones are missing in
1010 # not-cherry-picks and hence being dropped
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001011 git rev-list $revisions |
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001012 while read rev
1013 do
Elia Pintoe425f6a2014-06-06 07:55:52 -07001014 if test -f "$rewritten"/$rev && test "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001015 then
1016 # Use -f2 because if rev-list is telling us this commit is
1017 # not worthwhile, we don't want to track its multiple heads,
1018 # just the history of its first-parent for others that will
1019 # be rebasing on top of it
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001020 git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$dropped"/$rev
Kirill A. Shutemovedb72d52015-01-22 13:50:15 +02001021 sha1=$(git rev-list -1 $rev)
1022 sane_grep -v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo"
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001023 rm "$rewritten"/$rev
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001024 fi
1025 done
1026fi
1027
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001028test -s "$todo" || echo noop >> "$todo"
1029test -n "$autosquash" && rearrange_squash "$todo"
Lucien Kongc2145382012-06-12 10:05:12 +02001030test -n "$cmd" && add_exec_commands "$todo"
1031
Onno Kortmann97f05f42014-12-10 19:16:44 +01001032todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
1033
John Keeping180bad32013-02-11 23:08:04 +00001034cat >>"$todo" <<EOF
Johannes Schindelin6047a232007-11-22 12:30:10 +00001035
Onno Kortmann97f05f42014-12-10 19:16:44 +01001036$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s))
Andrew Wongfcc5ef12012-09-17 21:28:08 -04001037EOF
1038append_todo_help
John Keeping180bad32013-02-11 23:08:04 +00001039git stripspace --comment-lines >>"$todo" <<\EOF
1040
1041However, if you remove everything, the rebase will be aborted.
1042
Johannes Schindelin1b1dce42007-06-25 01:11:14 +01001043EOF
Johannes Schindelin1b1dce42007-06-25 01:11:14 +01001044
Neil Horman90e18182012-04-20 10:36:17 -04001045if test -z "$keep_empty"
1046then
John Keeping180bad32013-02-11 23:08:04 +00001047 printf '%s\n' "$comment_char Note that empty commits are commented out" >>"$todo"
Neil Horman90e18182012-04-20 10:36:17 -04001048fi
1049
1050
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001051has_action "$todo" ||
Ramkumar Ramachandrae4244eb2014-05-19 18:05:20 -04001052 return 2
Johannes Schindelin1b1dce42007-06-25 01:11:14 +01001053
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001054cp "$todo" "$todo".backup
Kirill A. Shutemovedb72d52015-01-22 13:50:15 +02001055collapse_todo_ids
Peter Oberndorfer821881d2011-10-17 22:26:23 +02001056git_sequence_editor "$todo" ||
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001057 die_abort "Could not execute editor"
Johannes Schindelin1b1dce42007-06-25 01:11:14 +01001058
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001059has_action "$todo" ||
Ramkumar Ramachandrae4244eb2014-05-19 18:05:20 -04001060 return 2
Johannes Schindelinc54b7812007-06-25 18:56:55 +01001061
Junio C Hamano75c69762013-08-23 20:10:42 -04001062expand_todo_ids
1063
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001064test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks
Johannes Schindelin0e757e32009-03-03 10:55:31 +01001065
Ramkumar Ramachandra26cd1602013-06-16 14:15:13 +05301066GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
Martin von Zweigbergk6bb4e482011-02-06 13:43:37 -05001067output git checkout $onto || die_abort "could not detach HEAD"
Martin von Zweigbergk431b7e72011-02-06 13:43:50 -05001068git update-ref ORIG_HEAD $orig_head
Martin von Zweigbergk34262322011-02-06 13:43:35 -05001069do_rest
Kyle J. McKay9f50d322014-04-11 01:28:17 -07001070
1071}
1072# ... and then we call the whole thing.
1073git_rebase__interactive