[thirdparty/git.git] / git-rebase--interactive.sh

#!/bin/sh
#
# Copyright (c) 2006 Johannes E. Schindelin

# SHORT DESCRIPTION
#
# This script makes it easy to fix up commits in the middle of a series,
# and rearrange commits.
#
# The original idea comes from Eric W. Biederman, in
# http://article.gmane.org/gmane.comp.version-control.git/22407

USAGE='(--continue | --abort | --skip | [--preserve-merges] [--verbose]
	[--onto <branch>] <upstream> [<branch>])'

OPTIONS_SPEC=
. git-sh-setup
require_work_tree

DOTEST="$GIT_DIR/.dotest-merge"
TODO="$DOTEST"/git-rebase-todo
DONE="$DOTEST"/done
MSG="$DOTEST"/message
SQUASH_MSG="$DOTEST"/message-squash
REWRITTEN="$DOTEST"/rewritten
PRESERVE_MERGES=
STRATEGY=
VERBOSE=
test -d "$REWRITTEN" && PRESERVE_MERGES=t
test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
test -f "$DOTEST"/verbose && VERBOSE=t

warn () {
	echo "$*" >&2
}

output () {
	case "$VERBOSE" in
	'')
		output=$("$@" 2>&1 )
		status=$?
		test $status != 0 && printf "%s\n" "$output"
		return $status
		;;
	*)
		"$@"
		;;
	esac
}

require_clean_work_tree () {
	# test if working tree is dirty
	git rev-parse --verify HEAD > /dev/null &&
	git update-index --refresh &&
	git diff-files --quiet &&
	git diff-index --cached --quiet HEAD ||
	die "Working tree is dirty"
}

ORIG_REFLOG_ACTION="$GIT_REFLOG_ACTION"

comment_for_reflog () {
	case "$ORIG_REFLOG_ACTION" in
	''|rebase*)
		GIT_REFLOG_ACTION="rebase -i ($1)"
		export GIT_REFLOG_ACTION
		;;
	esac
}

mark_action_done () {
	sed -e 1q < "$TODO" >> "$DONE"
	sed -e 1d < "$TODO" >> "$TODO".new
	mv -f "$TODO".new "$TODO"
	count=$(($(grep -ve '^$' -e '^#' < "$DONE" | wc -l)))
	total=$(($count+$(grep -ve '^$' -e '^#' < "$TODO" | wc -l)))
	printf "Rebasing (%d/%d)\r" $count $total
	test -z "$VERBOSE" || echo
}

make_patch () {
	parent_sha1=$(git rev-parse --verify "$1"^) ||
		die "Cannot get patch for $1^"
	git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch
	test -f "$DOTEST"/message ||
		git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
	test -f "$DOTEST"/author-script ||
		get_author_ident_from_commit "$1" > "$DOTEST"/author-script
}

die_with_patch () {
	make_patch "$1"
	die "$2"
}

die_abort () {
	rm -rf "$DOTEST"
	die "$1"
}

has_action () {
	grep -vqe '^$' -e '^#' "$1"
}

pick_one () {
	no_ff=
	case "$1" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac
	output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
	test -d "$REWRITTEN" &&
		pick_one_preserving_merges "$@" && return
	parent_sha1=$(git rev-parse --verify $sha1^) ||
		die "Could not get the parent of $sha1"
	current_sha1=$(git rev-parse --verify HEAD)
	if test "$no_ff$current_sha1" = "$parent_sha1"; then
		output git reset --hard $sha1
		test "a$1" = a-n && output git reset --soft $current_sha1
		sha1=$(git rev-parse --short $sha1)
		output warn Fast forward to $sha1
	else
		output git cherry-pick "$@"
	fi
}

pick_one_preserving_merges () {
	case "$1" in -n) sha1=$2 ;; *) sha1=$1 ;; esac
	sha1=$(git rev-parse $sha1)

	if test -f "$DOTEST"/current-commit
	then
		current_commit=$(cat "$DOTEST"/current-commit) &&
		git rev-parse HEAD > "$REWRITTEN"/$current_commit &&
		rm "$DOTEST"/current-commit ||
		die "Cannot write current commit's replacement sha1"
	fi

	# rewrite parents; if none were rewritten, we can fast-forward.
	fast_forward=t
	preserve=t
	new_parents=
	for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-)
	do
		if test -f "$REWRITTEN"/$p
		then
			preserve=f
			new_p=$(cat "$REWRITTEN"/$p)
			test $p != $new_p && fast_forward=f
			case "$new_parents" in
			*$new_p*)
				;; # do nothing; that parent is already there
			*)
				new_parents="$new_parents $new_p"
				;;
			esac
		fi
	done
	case $fast_forward in
	t)
		output warn "Fast forward to $sha1"
		test $preserve = f || echo $sha1 > "$REWRITTEN"/$sha1
		;;
	f)
		test "a$1" = a-n && die "Refusing to squash a merge: $sha1"

		first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
		# detach HEAD to current parent
		output git checkout $first_parent 2> /dev/null ||
			die "Cannot move HEAD to $first_parent"

		echo $sha1 > "$DOTEST"/current-commit
		case "$new_parents" in
		' '*' '*)
			# redo merge
			author_script=$(get_author_ident_from_commit $sha1)
			eval "$author_script"
			msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
			# No point in merging the first parent, that's HEAD
			new_parents=${new_parents# $first_parent}
			# NEEDSWORK: give rerere a chance
			if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
				GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
				GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
				output git merge $STRATEGY -m "$msg" \
					$new_parents
			then
				printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
				die Error redoing merge $sha1
			fi
			;;
		*)
			output git cherry-pick "$@" ||
				die_with_patch $sha1 "Could not pick $sha1"
			;;
		esac
		;;
	esac
}

nth_string () {
	case "$1" in
	*1[0-9]|*[04-9]) echo "$1"th;;
	*1) echo "$1"st;;
	*2) echo "$1"nd;;
	*3) echo "$1"rd;;
	esac
}

make_squash_message () {
	if test -f "$SQUASH_MSG"; then
		COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \
			< "$SQUASH_MSG" | tail -n 1)+1))
		echo "# This is a combination of $COUNT commits."
		sed -n "2,\$p" < "$SQUASH_MSG"
	else
		COUNT=2
		echo "# This is a combination of two commits."
		echo "# The first commit's message is:"
		echo
		git cat-file commit HEAD | sed -e '1,/^$/d'
		echo
	fi
	echo "# This is the $(nth_string $COUNT) commit message:"
	echo
	git cat-file commit $1 | sed -e '1,/^$/d'
}

peek_next_command () {
	sed -n "1s/ .*$//p" < "$TODO"
}

do_next () {
	rm -f "$DOTEST"/message "$DOTEST"/author-script \
		"$DOTEST"/amend || exit
	read command sha1 rest < "$TODO"
	case "$command" in
	'#'*|'')
		mark_action_done
		;;
	pick|p)
		comment_for_reflog pick

		mark_action_done
		pick_one $sha1 ||
			die_with_patch $sha1 "Could not apply $sha1... $rest"
		;;
	edit|e)
		comment_for_reflog edit

		mark_action_done
		pick_one $sha1 ||
			die_with_patch $sha1 "Could not apply $sha1... $rest"
		make_patch $sha1
		: > "$DOTEST"/amend
		warn
		warn "You can amend the commit now, with"
		warn
		warn "	git commit --amend"
		warn
		exit 0
		;;
	squash|s)
		comment_for_reflog squash

		has_action "$DONE" ||
			die "Cannot 'squash' without a previous commit"

		mark_action_done
		make_squash_message $sha1 > "$MSG"
		case "$(peek_next_command)" in
		squash|s)
			EDIT_COMMIT=
			USE_OUTPUT=output
			cp "$MSG" "$SQUASH_MSG"
			;;
		*)
			EDIT_COMMIT=-e
			USE_OUTPUT=
			rm -f "$SQUASH_MSG" || exit
			;;
		esac

		failed=f
		author_script=$(get_author_ident_from_commit HEAD)
		output git reset --soft HEAD^
		pick_one -n $sha1 || failed=t
		echo "$author_script" > "$DOTEST"/author-script
		case $failed in
		f)
			# This is like --amend, but with a different message
			eval "$author_script"
			GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
			GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
			GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
			$USE_OUTPUT git commit -F "$MSG" $EDIT_COMMIT
			;;
		t)
			cp "$MSG" "$GIT_DIR"/MERGE_MSG
			warn
			warn "Could not apply $sha1... $rest"
			die_with_patch $sha1 ""
			;;
		esac
		;;
	*)
		warn "Unknown command: $command $sha1 $rest"
		die_with_patch $sha1 "Please fix this in the file $TODO."
		;;
	esac
	test -s "$TODO" && return

	comment_for_reflog finish &&
	HEADNAME=$(cat "$DOTEST"/head-name) &&
	OLDHEAD=$(cat "$DOTEST"/head) &&
	SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
	if test -d "$REWRITTEN"
	then
		test -f "$DOTEST"/current-commit &&
			current_commit=$(cat "$DOTEST"/current-commit) &&
			git rev-parse HEAD > "$REWRITTEN"/$current_commit
		NEWHEAD=$(cat "$REWRITTEN"/$OLDHEAD)
	else
		NEWHEAD=$(git rev-parse HEAD)
	fi &&
	case $HEADNAME in
	refs/*)
		message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
		git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
		git symbolic-ref HEAD $HEADNAME
		;;
	esac && {
		test ! -f "$DOTEST"/verbose ||
			git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
	} &&
	rm -rf "$DOTEST" &&
	git gc --auto &&
	warn "Successfully rebased and updated $HEADNAME."

	exit
}

do_rest () {
	while :
	do
		do_next
	done
}

while test $# != 0
do
	case "$1" in
	--continue)
		comment_for_reflog continue

		test -d "$DOTEST" || die "No interactive rebase running"

		# commit if necessary
		git rev-parse --verify HEAD > /dev/null &&
		git update-index --refresh &&
		git diff-files --quiet &&
		! git diff-index --cached --quiet HEAD &&
		. "$DOTEST"/author-script && {
			test ! -f "$DOTEST"/amend || git reset --soft HEAD^
		} &&
		export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
		git commit -F "$DOTEST"/message -e

		require_clean_work_tree
		do_rest
		;;
	--abort)
		comment_for_reflog abort

		test -d "$DOTEST" || die "No interactive rebase running"

		HEADNAME=$(cat "$DOTEST"/head-name)
		HEAD=$(cat "$DOTEST"/head)
		case $HEADNAME in
		refs/*)
			git symbolic-ref HEAD $HEADNAME
			;;
		esac &&
		output git reset --hard $HEAD &&
		rm -rf "$DOTEST"
		exit
		;;
	--skip)
		comment_for_reflog skip

		test -d "$DOTEST" || die "No interactive rebase running"

		output git reset --hard && do_rest
		;;
	-s|--strategy)
		case "$#,$1" in
		*,*=*)
			STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
		1,*)
			usage ;;
		*)
			STRATEGY="-s $2"
			shift ;;
		esac
		;;
	--merge)
		# we use merge anyway
		;;
	-C*)
		die "Interactive rebase uses merge, so $1 does not make sense"
		;;
	-v|--verbose)
		VERBOSE=t
		;;
	-p|--preserve-merges)
		PRESERVE_MERGES=t
		;;
	-i|--interactive)
		# yeah, we know
		;;
	''|-h)
		usage
		;;
	*)
		test -d "$DOTEST" &&
			die "Interactive rebase already started"

		git var GIT_COMMITTER_IDENT >/dev/null ||
			die "You need to set your committer info first"

		comment_for_reflog start

		ONTO=
		case "$1" in
		--onto)
			ONTO=$(git rev-parse --verify "$2") ||
				die "Does not point to a valid commit: $2"
			shift; shift
			;;
		esac

		require_clean_work_tree

		if test ! -z "$2"
		then
			output git show-ref --verify --quiet "refs/heads/$2" ||
				die "Invalid branchname: $2"
			output git checkout "$2" ||
				die "Could not checkout $2"
		fi

		HEAD=$(git rev-parse --verify HEAD) || die "No HEAD?"
		UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"

		mkdir "$DOTEST" || die "Could not create temporary $DOTEST"

		test -z "$ONTO" && ONTO=$UPSTREAM

		: > "$DOTEST"/interactive || die "Could not mark as interactive"
		git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
			echo "detached HEAD" > "$DOTEST"/head-name

		echo $HEAD > "$DOTEST"/head
		echo $UPSTREAM > "$DOTEST"/upstream
		echo $ONTO > "$DOTEST"/onto
		test -z "$STRATEGY" || echo "$STRATEGY" > "$DOTEST"/strategy
		test t = "$VERBOSE" && : > "$DOTEST"/verbose
		if test t = "$PRESERVE_MERGES"
		then
			# $REWRITTEN contains files for each commit that is
			# reachable by at least one merge base of $HEAD and
			# $UPSTREAM. They are not necessarily rewritten, but
			# their children might be.
			# This ensures that commits on merged, but otherwise
			# unrelated side branches are left alone. (Think "X"
			# in the man page's example.)
			mkdir "$REWRITTEN" &&
			for c in $(git merge-base --all $HEAD $UPSTREAM)
			do
				echo $ONTO > "$REWRITTEN"/$c ||
					die "Could not init rewritten commits"
			done
			MERGES_OPTION=
		else
			MERGES_OPTION=--no-merges
		fi

		SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
		SHORTHEAD=$(git rev-parse --short $HEAD)
		SHORTONTO=$(git rev-parse --short $ONTO)
		cat > "$TODO" << EOF
# Rebasing $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
#
# Commands:
#  pick = use commit
#  edit = use commit, but stop for amending
#  squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
EOF
		git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
			--abbrev=7 --reverse --left-right --cherry-pick \
			$UPSTREAM...$HEAD | \
			sed -n "s/^>/pick /p" >> "$TODO"

		has_action "$TODO" ||
			die_abort "Nothing to do"

		cp "$TODO" "$TODO".backup
		git_editor "$TODO" ||
			die "Could not execute editor"

		has_action "$TODO" ||
			die_abort "Nothing to do"

		output git checkout $ONTO && do_rest
		;;
	esac
	shift
done
Commit	Line	Data
1b1dce4b JS	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
f09c9b8c JS	13	USAGE='(--continue \| --abort \| --skip \| [--preserve-merges] [--verbose]
f09c9b8c JS	14	[--onto <branch>] <upstream> [<branch>])'
1b1dce4b	15
8f321a39	16	OPTIONS_SPEC=
1b1dce4b JS	17	. git-sh-setup
	18	require_work_tree
	19
	20	DOTEST="$GIT_DIR/.dotest-merge"
c22486c9	21	TODO="$DOTEST"/git-rebase-todo
1b1dce4b	22	DONE="$DOTEST"/done
6368f3f8 JS	23	MSG="$DOTEST"/message
6368f3f8 JS	24	SQUASH_MSG="$DOTEST"/message-squash
f09c9b8c JS	25	REWRITTEN="$DOTEST"/rewritten
f09c9b8c JS	26	PRESERVE_MERGES=
1b1dce4b JS	27	STRATEGY=
1b1dce4b JS	28	VERBOSE=
8e4a91bd JS	29	test -d "$REWRITTEN" && PRESERVE_MERGES=t
	30	test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
	31	test -f "$DOTEST"/verbose && VERBOSE=t
1b1dce4b JS	32
	33	warn () {
	34	echo "$*" >&2
	35	}
	36
dfa49f33 JS	37	output () {
	38	case "$VERBOSE" in
	39	'')
5166810b	40	output=$("$@" 2>&1 )
dfa49f33	41	status=$?
5166810b	42	test $status != 0 && printf "%s\n" "$output"
dfa49f33	43	return $status
376ccb8c	44	;;
dfa49f33 JS	45	*)
dfa49f33 JS	46	"$@"
376ccb8c	47	;;
dfa49f33 JS	48	esac
	49	}
	50
1b1dce4b JS	51	require_clean_work_tree () {
	52	# test if working tree is dirty
	53	git rev-parse --verify HEAD > /dev/null &&
	54	git update-index --refresh &&
	55	git diff-files --quiet &&
	56	git diff-index --cached --quiet HEAD \|\|
	57	die "Working tree is dirty"
	58	}
	59
	60	ORIG_REFLOG_ACTION="$GIT_REFLOG_ACTION"
	61
	62	comment_for_reflog () {
	63	case "$ORIG_REFLOG_ACTION" in
	64	''\|rebase*)
	65	GIT_REFLOG_ACTION="rebase -i ($1)"
	66	export GIT_REFLOG_ACTION
376ccb8c	67	;;
1b1dce4b JS	68	esac
	69	}
	70
	71	mark_action_done () {
	72	sed -e 1q < "$TODO" >> "$DONE"
	73	sed -e 1d < "$TODO" >> "$TODO".new
	74	mv -f "$TODO".new "$TODO"
dad4e32c JS	75	count=$(($(grep -ve '^$' -e '^#' < "$DONE" \| wc -l)))
dad4e32c JS	76	total=$(($count+$(grep -ve '^$' -e '^#' < "$TODO" \| wc -l)))
dfa49f33 JS	77	printf "Rebasing (%d/%d)\r" $count $total
dfa49f33 JS	78	test -z "$VERBOSE" \|\| echo
1b1dce4b JS	79	}
	80
	81	make_patch () {
be6ff208 JS	82	parent_sha1=$(git rev-parse --verify "$1"^) \|\|
be6ff208 JS	83	die "Cannot get patch for $1^"
f3d5e463	84	git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch
be6ff208 JS	85	test -f "$DOTEST"/message \|\|
	86	git cat-file commit "$1" \| sed "1,/^$/d" > "$DOTEST"/message
	87	test -f "$DOTEST"/author-script \|\|
	88	get_author_ident_from_commit "$1" > "$DOTEST"/author-script
1b1dce4b JS	89	}
	90
	91	die_with_patch () {
	92	make_patch "$1"
	93	die "$2"
	94	}
	95
c54b7817 JS	96	die_abort () {
	97	rm -rf "$DOTEST"
	98	die "$1"
	99	}
	100
376ccb8c JS	101	has_action () {
	102	grep -vqe '^$' -e '^#' "$1"
	103	}
	104
1b1dce4b	105	pick_one () {
1d25c8cf JS	106	no_ff=
1d25c8cf JS	107	case "$1" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac
dfa49f33	108	output git rev-parse --verify $sha1 \|\| die "Invalid commit name: $sha1"
f09c9b8c JS	109	test -d "$REWRITTEN" &&
f09c9b8c JS	110	pick_one_preserving_merges "$@" && return
376ccb8c JS	111	parent_sha1=$(git rev-parse --verify $sha1^) \|\|
376ccb8c JS	112	die "Could not get the parent of $sha1"
1b1dce4b	113	current_sha1=$(git rev-parse --verify HEAD)
2858028e	114	if test "$no_ff$current_sha1" = "$parent_sha1"; then
dfa49f33 JS	115	output git reset --hard $sha1
dfa49f33 JS	116	test "a$1" = a-n && output git reset --soft $current_sha1
1b1dce4b	117	sha1=$(git rev-parse --short $sha1)
dfa49f33	118	output warn Fast forward to $sha1
1b1dce4b	119	else
2a9c53e0	120	output git cherry-pick "$@"
1b1dce4b JS	121	fi
	122	}
	123
f09c9b8c JS	124	pick_one_preserving_merges () {
	125	case "$1" in -n) sha1=$2 ;; *) sha1=$1 ;; esac
	126	sha1=$(git rev-parse $sha1)
	127
3b38ec16	128	if test -f "$DOTEST"/current-commit
f09c9b8c JS	129	then
	130	current_commit=$(cat "$DOTEST"/current-commit) &&
	131	git rev-parse HEAD > "$REWRITTEN"/$current_commit &&
	132	rm "$DOTEST"/current-commit \|\|
	133	die "Cannot write current commit's replacement sha1"
	134	fi
	135
	136	# rewrite parents; if none were rewritten, we can fast-forward.
	137	fast_forward=t
	138	preserve=t
	139	new_parents=
376ccb8c	140	for p in $(git rev-list --parents -1 $sha1 \| cut -d' ' -f2-)
f09c9b8c	141	do
3b38ec16	142	if test -f "$REWRITTEN"/$p
f09c9b8c JS	143	then
	144	preserve=f
	145	new_p=$(cat "$REWRITTEN"/$p)
	146	test $p != $new_p && fast_forward=f
	147	case "$new_parents" in
	148	$new_p)
	149	;; # do nothing; that parent is already there
	150	*)
	151	new_parents="$new_parents $new_p"
376ccb8c	152	;;
f09c9b8c JS	153	esac
	154	fi
	155	done
	156	case $fast_forward in
	157	t)
dfa49f33	158	output warn "Fast forward to $sha1"
376ccb8c	159	test $preserve = f \|\| echo $sha1 > "$REWRITTEN"/$sha1
f09c9b8c JS	160	;;
	161	f)
	162	test "a$1" = a-n && die "Refusing to squash a merge: $sha1"
	163
376ccb8c	164	first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
f09c9b8c	165	# detach HEAD to current parent
dfa49f33	166	output git checkout $first_parent 2> /dev/null \|\|
f09c9b8c JS	167	die "Cannot move HEAD to $first_parent"
	168
	169	echo $sha1 > "$DOTEST"/current-commit
	170	case "$new_parents" in
376ccb8c	171	' '' ')
f09c9b8c JS	172	# redo merge
	173	author_script=$(get_author_ident_from_commit $sha1)
	174	eval "$author_script"
376ccb8c	175	msg="$(git cat-file commit $sha1 \| sed -e '1,/^$/d')"
f91333d6 BS	176	# No point in merging the first parent, that's HEAD
f91333d6 BS	177	new_parents=${new_parents# $first_parent}
f09c9b8c	178	# NEEDSWORK: give rerere a chance
ae830ed7 JS	179	if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
	180	GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
	181	GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
	182	output git merge $STRATEGY -m "$msg" \
	183	$new_parents
f09c9b8c	184	then
376ccb8c	185	printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
18640d99	186	die Error redoing merge $sha1
f09c9b8c JS	187	fi
	188	;;
	189	*)
2a9c53e0	190	output git cherry-pick "$@" \|\|
f09c9b8c	191	die_with_patch $sha1 "Could not pick $sha1"
376ccb8c	192	;;
f09c9b8c	193	esac
376ccb8c	194	;;
f09c9b8c JS	195	esac
	196	}
	197
6368f3f8 JS	198	nth_string () {
	199	case "$1" in
	200	1[0-9]\|[04-9]) echo "$1"th;;
	201	*1) echo "$1"st;;
	202	*2) echo "$1"nd;;
	203	*3) echo "$1"rd;;
	204	esac
	205	}
	206
	207	make_squash_message () {
3b38ec16	208	if test -f "$SQUASH_MSG"; then
c7965afd	209	COUNT=$(($(sed -n "s/^# This is [^0-9]\([1-9][0-9]\).*/\1/p" \
6368f3f8 JS	210	< "$SQUASH_MSG" \| tail -n 1)+1))
	211	echo "# This is a combination of $COUNT commits."
	212	sed -n "2,\$p" < "$SQUASH_MSG"
	213	else
	214	COUNT=2
	215	echo "# This is a combination of two commits."
	216	echo "# The first commit's message is:"
	217	echo
	218	git cat-file commit HEAD \| sed -e '1,/^$/d'
	219	echo
	220	fi
	221	echo "# This is the $(nth_string $COUNT) commit message:"
	222	echo
	223	git cat-file commit $1 \| sed -e '1,/^$/d'
	224	}
	225
	226	peek_next_command () {
	227	sed -n "1s/ .*$//p" < "$TODO"
	228	}
	229
1b1dce4b	230	do_next () {
376ccb8c JS	231	rm -f "$DOTEST"/message "$DOTEST"/author-script \
376ccb8c JS	232	"$DOTEST"/amend \|\| exit
1b1dce4b JS	233	read command sha1 rest < "$TODO"
1b1dce4b JS	234	case "$command" in
376ccb8c	235	'#'*\|'')
1b1dce4b	236	mark_action_done
1b1dce4b	237	;;
f8babc4d	238	pick\|p)
1b1dce4b JS	239	comment_for_reflog pick
	240
	241	mark_action_done
	242	pick_one $sha1 \|\|
	243	die_with_patch $sha1 "Could not apply $sha1... $rest"
	244	;;
f8babc4d	245	edit\|e)
1b1dce4b JS	246	comment_for_reflog edit
	247
	248	mark_action_done
	249	pick_one $sha1 \|\|
	250	die_with_patch $sha1 "Could not apply $sha1... $rest"
	251	make_patch $sha1
be6ff208	252	: > "$DOTEST"/amend
1b1dce4b JS	253	warn
	254	warn "You can amend the commit now, with"
	255	warn
	256	warn " git commit --amend"
	257	warn
	258	exit 0
	259	;;
f8babc4d	260	squash\|s)
1b1dce4b JS	261	comment_for_reflog squash
1b1dce4b JS	262
376ccb8c	263	has_action "$DONE" \|\|
1b1dce4b JS	264	die "Cannot 'squash' without a previous commit"
	265
	266	mark_action_done
6368f3f8 JS	267	make_squash_message $sha1 > "$MSG"
6368f3f8 JS	268	case "$(peek_next_command)" in
f8babc4d	269	squash\|s)
6368f3f8	270	EDIT_COMMIT=
91e1ee77	271	USE_OUTPUT=output
6368f3f8	272	cp "$MSG" "$SQUASH_MSG"
376ccb8c	273	;;
6368f3f8 JS	274	*)
6368f3f8 JS	275	EDIT_COMMIT=-e
91e1ee77	276	USE_OUTPUT=
376ccb8c JS	277	rm -f "$SQUASH_MSG" \|\| exit
376ccb8c JS	278	;;
6368f3f8 JS	279	esac
6368f3f8 JS	280
793ad041	281	failed=f
81ab1cb4	282	author_script=$(get_author_ident_from_commit HEAD)
dfa49f33	283	output git reset --soft HEAD^
fb47cfbd	284	pick_one -n $sha1 \|\| failed=t
18640d99	285	echo "$author_script" > "$DOTEST"/author-script
1b1dce4b JS	286	case $failed in
	287	f)
	288	# This is like --amend, but with a different message
	289	eval "$author_script"
ae830ed7 JS	290	GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
	291	GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
	292	GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
91e1ee77	293	$USE_OUTPUT git commit -F "$MSG" $EDIT_COMMIT
1b1dce4b JS	294	;;
	295	t)
	296	cp "$MSG" "$GIT_DIR"/MERGE_MSG
	297	warn
	298	warn "Could not apply $sha1... $rest"
1b1dce4b	299	die_with_patch $sha1 ""
376ccb8c	300	;;
1b1dce4b JS	301	esac
	302	;;
	303	*)
	304	warn "Unknown command: $command $sha1 $rest"
	305	die_with_patch $sha1 "Please fix this in the file $TODO."
376ccb8c	306	;;
1b1dce4b JS	307	esac
	308	test -s "$TODO" && return
	309
68a163c9 JS	310	comment_for_reflog finish &&
	311	HEADNAME=$(cat "$DOTEST"/head-name) &&
	312	OLDHEAD=$(cat "$DOTEST"/head) &&
	313	SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
3b38ec16	314	if test -d "$REWRITTEN"
f09c9b8c JS	315	then
	316	test -f "$DOTEST"/current-commit &&
	317	current_commit=$(cat "$DOTEST"/current-commit) &&
	318	git rev-parse HEAD > "$REWRITTEN"/$current_commit
	319	NEWHEAD=$(cat "$REWRITTEN"/$OLDHEAD)
	320	else
	321	NEWHEAD=$(git rev-parse HEAD)
	322	fi &&
73697a0b JS	323	case $HEADNAME in
	324	refs/*)
	325	message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
	326	git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
	327	git symbolic-ref HEAD $HEADNAME
	328	;;
	329	esac && {
3df0a859	330	test ! -f "$DOTEST"/verbose \|\|
f3d5e463	331	git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
3df0a859	332	} &&
1b1dce4b	333	rm -rf "$DOTEST" &&
73697a0b	334	git gc --auto &&
1b1dce4b JS	335	warn "Successfully rebased and updated $HEADNAME."
	336
	337	exit
	338	}
	339
	340	do_rest () {
	341	while :
	342	do
	343	do_next
	344	done
1b1dce4b JS	345	}
1b1dce4b JS	346
822f7c73	347	while test $# != 0
1b1dce4b JS	348	do
	349	case "$1" in
	350	--continue)
	351	comment_for_reflog continue
	352
	353	test -d "$DOTEST" \|\| die "No interactive rebase running"
	354
18640d99 JS	355	# commit if necessary
	356	git rev-parse --verify HEAD > /dev/null &&
	357	git update-index --refresh &&
	358	git diff-files --quiet &&
	359	! git diff-index --cached --quiet HEAD &&
be6ff208 JS	360	. "$DOTEST"/author-script && {
	361	test ! -f "$DOTEST"/amend \|\| git reset --soft HEAD^
	362	} &&
18640d99 JS	363	export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
	364	git commit -F "$DOTEST"/message -e
	365
1b1dce4b JS	366	require_clean_work_tree
	367	do_rest
	368	;;
	369	--abort)
	370	comment_for_reflog abort
	371
	372	test -d "$DOTEST" \|\| die "No interactive rebase running"
	373
	374	HEADNAME=$(cat "$DOTEST"/head-name)
	375	HEAD=$(cat "$DOTEST"/head)
73697a0b JS	376	case $HEADNAME in
	377	refs/*)
	378	git symbolic-ref HEAD $HEADNAME
	379	;;
	380	esac &&
dfa49f33	381	output git reset --hard $HEAD &&
1b1dce4b JS	382	rm -rf "$DOTEST"
	383	exit
	384	;;
	385	--skip)
	386	comment_for_reflog skip
	387
	388	test -d "$DOTEST" \|\| die "No interactive rebase running"
	389
dfa49f33	390	output git reset --hard && do_rest
1b1dce4b JS	391	;;
1b1dce4b JS	392	-s\|--strategy)
1b1dce4b JS	393	case "$#,$1" in
1b1dce4b JS	394	,=*)
b5e960b1	395	STRATEGY="-s "$(expr "z$1" : 'z-[^=]=\(.\)') ;;
1b1dce4b JS	396	1,*)
	397	usage ;;
	398	*)
	399	STRATEGY="-s $2"
	400	shift ;;
	401	esac
	402	;;
	403	--merge)
	404	# we use merge anyway
	405	;;
	406	-C*)
	407	die "Interactive rebase uses merge, so $1 does not make sense"
	408	;;
c54b7817	409	-v\|--verbose)
1b1dce4b JS	410	VERBOSE=t
1b1dce4b JS	411	;;
f09c9b8c JS	412	-p\|--preserve-merges)
	413	PRESERVE_MERGES=t
	414	;;
1b1dce4b JS	415	-i\|--interactive)
	416	# yeah, we know
	417	;;
	418	''\|-h)
	419	usage
	420	;;
	421	*)
	422	test -d "$DOTEST" &&
	423	die "Interactive rebase already started"
	424
	425	git var GIT_COMMITTER_IDENT >/dev/null \|\|
	426	die "You need to set your committer info first"
	427
	428	comment_for_reflog start
	429
	430	ONTO=
	431	case "$1" in
	432	--onto)
	433	ONTO=$(git rev-parse --verify "$2") \|\|
	434	die "Does not point to a valid commit: $2"
	435	shift; shift
	436	;;
	437	esac
	438
	439	require_clean_work_tree
	440
3b38ec16	441	if test ! -z "$2"
1b1dce4b	442	then
dfa49f33	443	output git show-ref --verify --quiet "refs/heads/$2" \|\|
1b1dce4b	444	die "Invalid branchname: $2"
dfa49f33	445	output git checkout "$2" \|\|
1b1dce4b JS	446	die "Could not checkout $2"
	447	fi
	448
	449	HEAD=$(git rev-parse --verify HEAD) \|\| die "No HEAD?"
	450	UPSTREAM=$(git rev-parse --verify "$1") \|\| die "Invalid base"
	451
5166810b MK	452	mkdir "$DOTEST" \|\| die "Could not create temporary $DOTEST"
5166810b MK	453
1b1dce4b JS	454	test -z "$ONTO" && ONTO=$UPSTREAM
1b1dce4b JS	455
1b1dce4b	456	: > "$DOTEST"/interactive \|\| die "Could not mark as interactive"
73697a0b JS	457	git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null \|\|
73697a0b JS	458	echo "detached HEAD" > "$DOTEST"/head-name
1b1dce4b JS	459
	460	echo $HEAD > "$DOTEST"/head
	461	echo $UPSTREAM > "$DOTEST"/upstream
	462	echo $ONTO > "$DOTEST"/onto
8e4a91bd	463	test -z "$STRATEGY" \|\| echo "$STRATEGY" > "$DOTEST"/strategy
1b1dce4b	464	test t = "$VERBOSE" && : > "$DOTEST"/verbose
3b38ec16	465	if test t = "$PRESERVE_MERGES"
f09c9b8c JS	466	then
	467	# $REWRITTEN contains files for each commit that is
	468	# reachable by at least one merge base of $HEAD and
	469	# $UPSTREAM. They are not necessarily rewritten, but
	470	# their children might be.
	471	# This ensures that commits on merged, but otherwise
	472	# unrelated side branches are left alone. (Think "X"
	473	# in the man page's example.)
	474	mkdir "$REWRITTEN" &&
	475	for c in $(git merge-base --all $HEAD $UPSTREAM)
	476	do
	477	echo $ONTO > "$REWRITTEN"/$c \|\|
	478	die "Could not init rewritten commits"
	479	done
	480	MERGES_OPTION=
	481	else
	482	MERGES_OPTION=--no-merges
	483	fi
1b1dce4b	484
c54b7817 JS	485	SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
	486	SHORTHEAD=$(git rev-parse --short $HEAD)
	487	SHORTONTO=$(git rev-parse --short $ONTO)
1b1dce4b	488	cat > "$TODO" << EOF
c54b7817	489	# Rebasing $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
1b1dce4b JS	490	#
	491	# Commands:
	492	# pick = use commit
	493	# edit = use commit, but stop for amending
	494	# squash = use commit, but meld into previous commit
82576ddb JS	495	#
	496	# If you remove a line here THAT COMMIT WILL BE LOST.
	497	#
1b1dce4b	498	EOF
f09c9b8c	499	git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
96ffe892 JS	500	--abbrev=7 --reverse --left-right --cherry-pick \
	501	$UPSTREAM...$HEAD \| \
	502	sed -n "s/^>/pick /p" >> "$TODO"
1b1dce4b	503
376ccb8c	504	has_action "$TODO" \|\|
c54b7817	505	die_abort "Nothing to do"
1b1dce4b JS	506
1b1dce4b JS	507	cp "$TODO" "$TODO".backup
ef0c2abf	508	git_editor "$TODO" \|\|
1b1dce4b JS	509	die "Could not execute editor"
1b1dce4b JS	510
376ccb8c	511	has_action "$TODO" \|\|
c54b7817 JS	512	die_abort "Nothing to do"
c54b7817 JS	513
dfa49f33	514	output git checkout $ONTO && do_rest
376ccb8c	515	;;
1b1dce4b JS	516	esac
	517	shift
	518	done