X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-rebase.sh;h=16d4359830d7f987f571f8d3520f60062f60fab6;hb=ee34518d629331dadd58b1a75294369d679eda8b;hp=fa95009091525eb9ea65bce1e08f293dfd1eddca;hpb=bf7960eb51a26bcf52f27a60bfcf005661266b1e;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index fa950090..16d43598 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,67 +3,64 @@ # Copyright (c) 2005 Junio C Hamano. # -. git-sh-setup || die "Not a git archive." +USAGE=' []' +. git-sh-setup -usage="usage: $0 "' [] +case $# in 1|2) ;; *) usage ;; esac -Uses output from git-cherry to rebase local commits to the new head of -upstream tree.' +# Make sure we do not have .dotest +if mkdir .dotest +then + rmdir .dotest +else + echo >&2 ' +It seems that I cannot create a .dotest directory, and I wonder if you +are in the middle of patch application or another rebase. If that is not +the case, please rm -fr .dotest and run me again. I am stopping in case +you still have something valuable there.' + exit 1 +fi -case "$#,$1" in -1,*..*) - upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$') - set x "$upstream" "$ours" - shift ;; +# The tree must be really really clean. +git-update-index --refresh || exit +diff=$(git-diff-index --cached --name-status -r HEAD) +case "$diff" in +?*) echo "$diff" + exit 1 + ;; esac -git-update-index --refresh || exit +# The other head is given. Make sure it is valid. +other=$(git-rev-parse --verify "$1^0") || usage +# Make sure the branch to rebase is valid. +head=$(git-rev-parse --verify "${2-HEAD}^0") || exit + +# If the branch to rebase is given, first switch to it. case "$#" in -1) ours_symbolic=HEAD ;; -2) ours_symbolic="$2" ;; -*) die "$usage" ;; +2) + git-checkout "$2" || 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 +mb=$(git-merge-base "$other" "$head") -tmp=.rebase-tmp$$ -fail=$tmp-fail -trap "rm -rf $tmp-*" 1 2 3 15 +# Check if we are already based on $other. +if test "$mb" = "$other" +then + echo >&2 "Current branch `git-symbolic-ref HEAD` is up to date." + exit 0 +fi ->$fail +# Rewind the head to "$other" +git-reset --hard "$other" -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 +# If the $other is a proper descendant of the tip of the branch, then +# we just fast forwarded. +if test "$mb" = "$head" 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 + echo >&2 "Fast-forwarded $head to $other." + exit 0 fi + +git-format-patch -k --stdout --full-index "$other" ORIG_HEAD | +git am --binary -3 -k