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

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano.
#

. git-sh-setup || die "Not a git archive."

usage="usage: $0 "'<upstream> [<head>]

Uses output from git-cherry to rebase local commits to the new head of
upstream tree.'

case "$#,$1" in
1,*..*)
    upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
    set x "$upstream" "$ours"
    shift ;;
esac

git-update-index --refresh || exit

case "$#" in
1) ours_symbolic=HEAD ;;
2) ours_symbolic="$2" ;;
*) die "$usage" ;;
esac

upstream=`git-rev-parse --verify "$1"` &&
ours=`git-rev-parse --verify "$ours_symbolic"` || exit
different1=$(git-diff-index --name-only --cached "$ours") &&
different2=$(git-diff-index --name-only "$ours") &&
test "$different1$different2" = "" ||
die "Your working tree does not match $ours_symbolic."

git-read-tree -m -u $ours $upstream &&
new_head=$(git-rev-parse --verify "$upstream^0") &&
git-update-ref HEAD "$new_head" || exit

tmp=.rebase-tmp$$
fail=$tmp-fail
trap "rm -rf $tmp-*" 1 2 3 15

>$fail

git-cherry -v $upstream $ours |
while read sign commit msg
do
	case "$sign" in
	-)
		echo >&2 "* Already applied: $msg"
		continue ;;
	esac
	echo >&2 "* Applying: $msg"
	S=$(git-rev-parse --verify HEAD) &&
	git-cherry-pick --replay $commit || {
		echo >&2 "* Not applying the patch and continuing."
		echo $commit >>$fail
		git-reset --hard $S
	}
done
if test -s $fail
then
	echo >&2 Some commits could not be rebased, check by hand:
	cat >&2 $fail
	echo >&2 "(the same list of commits are found in $tmp)"
	exit 1
else
	rm -f $fail
fi
Commit	Line	Data
59e6b23a JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2005 Junio C Hamano.
	4	#
	5
215a7ad1	6	. git-sh-setup \|\| die "Not a git archive."
4282c4fb	7
59e6b23a JH	8	usage="usage: $0 "'<upstream> [<head>]
	9
	10	Uses output from git-cherry to rebase local commits to the new head of
	11	upstream tree.'
	12
4282c4fb JH	13	case "$#,$1" in
	14	1,..)
	15	upstream=$(expr "$1" : '\(.\)\.\.') ours=$(expr "$1" : '.\.\.\(.*\)$')
	16	set x "$upstream" "$ours"
	17	shift ;;
	18	esac
59e6b23a	19
215a7ad1	20	git-update-index --refresh \|\| exit
99a92f92	21
59e6b23a	22	case "$#" in
99a92f92 JH	23	1) ours_symbolic=HEAD ;;
	24	2) ours_symbolic="$2" ;;
	25	*) die "$usage" ;;
59e6b23a JH	26	esac
59e6b23a JH	27
99a92f92	28	upstream=`git-rev-parse --verify "$1"` &&
66e06b6a	29	ours=`git-rev-parse --verify "$ours_symbolic"` \|\| exit
215a7ad1 JH	30	different1=$(git-diff-index --name-only --cached "$ours") &&
215a7ad1 JH	31	different2=$(git-diff-index --name-only "$ours") &&
a8055f8a	32	test "$different1$different2" = "" \|\|
99a92f92 JH	33	die "Your working tree does not match $ours_symbolic."
99a92f92 JH	34
4282c4fb	35	git-read-tree -m -u $ours $upstream &&
bf7960eb JH	36	new_head=$(git-rev-parse --verify "$upstream^0") &&
bf7960eb JH	37	git-update-ref HEAD "$new_head" \|\| exit
59e6b23a JH	38
	39	tmp=.rebase-tmp$$
	40	fail=$tmp-fail
48313592	41	trap "rm -rf $tmp-*" 1 2 3 15
59e6b23a JH	42
	43	>$fail
	44
48313592 JH	45	git-cherry -v $upstream $ours \|
48313592 JH	46	while read sign commit msg
59e6b23a JH	47	do
59e6b23a JH	48	case "$sign" in
48313592 JH	49	-)
	50	echo >&2 "* Already applied: $msg"
	51	continue ;;
59e6b23a	52	esac
48313592	53	echo >&2 "* Applying: $msg"
bf7960eb	54	S=$(git-rev-parse --verify HEAD) &&
215a7ad1	55	git-cherry-pick --replay $commit \|\| {
48313592	56	echo >&2 "* Not applying the patch and continuing."
59e6b23a	57	echo $commit >>$fail
215a7ad1	58	git-reset --hard $S
59e6b23a JH	59	}
	60	done
	61	if test -s $fail
	62	then
48313592 JH	63	echo >&2 Some commits could not be rebased, check by hand:
	64	cat >&2 $fail
	65	echo >&2 "(the same list of commits are found in $tmp)"
	66	exit 1
	67	else
	68	rm -f $fail
59e6b23a	69	fi