X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=git-rebase-script;h=a335b991782e56b9ce33520a4671539791ff4fb8;hb=14022f5b1c5e5408ed5f1e8a91ae423e3228df0c;hp=5b791c6bda49ff82fb562519711eb8c7abb6bc55;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git diff --git a/git-rebase-script b/git-rebase-script index 5b791c6bd..a335b9917 100755 --- a/git-rebase-script +++ b/git-rebase-script @@ -3,25 +3,37 @@ # Copyright (c) 2005 Junio C Hamano. # +. git-sh-setup-script || die "Not a git archive." + usage="usage: $0 "' [] Uses output from git-cherry to rebase local commits to the new head of upstream tree.' -: ${GIT_DIR=.git} +case "$#,$1" in +1,*..*) + upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$') + set x "$upstream" "$ours" + shift ;; +esac + +git-update-cache --refresh || exit case "$#" in -1) linus=`git-rev-parse --verify "$1"` && - junio=`git-rev-parse --verify HEAD` || exit - ;; -2) linus=`git-rev-parse --verify "$1"` && - junio=`git-rev-parse --verify "$2"` || exit - ;; -*) echo >&2 "$usage"; exit 1 ;; +1) ours_symbolic=HEAD ;; +2) ours_symbolic="$2" ;; +*) die "$usage" ;; esac -git-read-tree -m -u $junio $linus && -echo "$linus" >"$GIT_DIR/HEAD" || exit +upstream=`git-rev-parse --verify "$1"` && +ours=`git-rev-parse --verify "$ours_symbolic"` || exit +different1=$(git-diff-cache --name-only --cached "$ours") && +different2=$(git-diff-cache --name-only "$ours") && +test "$different1$different2" = "" || +die "Your working tree does not match $ours_symbolic." + +git-read-tree -m -u $ours $upstream && +git-rev-parse --verify "$upstream^0" >"$GIT_DIR/HEAD" || exit tmp=.rebase-tmp$$ fail=$tmp-fail @@ -29,7 +41,7 @@ trap "rm -rf $tmp-*" 0 1 2 3 15 >$fail -git-cherry $linus $junio | +git-cherry $upstream $ours | while read sign commit do case "$sign" in @@ -37,7 +49,7 @@ do esac S=`cat "$GIT_DIR/HEAD"` && GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p $commit && - git-commit-script -m "$commit" || { + git-commit-script -C "$commit" || { echo $commit >>$fail git-read-tree --reset -u $S }