X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-rebase.sh;h=c1619ff1400f68300d5026a00baf72e27f268ba1;hb=2db8aaeca1dca4e940829b87d1164e5b42ff49b4;hp=2bc3a12995ec5f18cf666289a6691fa2e4d3fb47;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 2bc3a129..c1619ff1 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,10 +3,29 @@ # Copyright (c) 2005 Junio C Hamano. # +USAGE=' []' . git-sh-setup -# The other head is given -other=$(git-rev-parse --verify "$1^0") || exit +case $# in 1|2) ;; *) usage ;; esac + +# 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 + +# The other head is given. Make sure it is valid. +other=$(git-rev-parse --verify "$1^0") || usage + +# Make sure we have HEAD that is valid. +head=$(git-rev-parse --verify "HEAD^0") || exit # The tree must be really really clean. git-update-index --refresh || exit @@ -20,9 +39,20 @@ esac # If the branch to rebase is given, first switch to it. case "$#" in 2) - git-checkout "$2" || exit + head=$(git-rev-parse --verify "$2^") || usage + git-checkout "$2" || usage esac +# If the HEAD is a proper descendant of $other, we do not even need +# to rebase. Make sure we do not do needless rebase. In such a +# case, merge-base should be the same as "$other". +mb=$(git-merge-base "$other" "$head") +if test "$mb" = "$other" +then + echo >&2 "Current branch `git-symbolic-ref HEAD` is up to date." + exit 0 +fi + # Rewind the head to "$other" git-reset --hard "$other" git-format-patch -k --stdout --full-index "$other" ORIG_HEAD |