From 3ae39ab232a103c2a4284a6701be62d95f0d0987 Mon Sep 17 00:00:00 2001 From: "freku045@student.liu.se" Date: Tue, 13 Dec 2005 23:30:32 +0100 Subject: git-rebase: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-rebase.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index 638ff0dbc0..8a5f44aa5e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,6 +3,7 @@ # Copyright (c) 2005 Junio C Hamano. # +USAGE=' []' . git-sh-setup # Make sure we do not have .dotest @@ -19,7 +20,7 @@ you still have something valuable there.' fi # The other head is given. Make sure it is valid. -other=$(git-rev-parse --verify "$1^0") || exit +other=$(git-rev-parse --verify "$1^0") || usage # Make sure we have HEAD that is valid. head=$(git-rev-parse --verify "HEAD^0") || exit @@ -36,7 +37,7 @@ esac # If the branch to rebase is given, first switch to it. case "$#" in 2) - git-checkout "$2" || exit + git-checkout "$2" || usage esac # If the HEAD is a proper descendant of $other, we do not even need -- cgit v1.3 From 2db8aaeca1dca4e940829b87d1164e5b42ff49b4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Dec 2005 03:11:37 -0800 Subject: rebase: do not get confused in fast-forward situation. When switching to another branch and rebasing it in a one-go, it failed to update the variable that holds the branch head, and did not detect fast-forward situation correctly. Signed-off-by: Junio C Hamano --- git-rebase.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index 8a5f44aa5e..c1619ff140 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -6,6 +6,8 @@ USAGE=' []' . git-sh-setup +case $# in 1|2) ;; *) usage ;; esac + # Make sure we do not have .dotest if mkdir .dotest then @@ -37,6 +39,7 @@ esac # If the branch to rebase is given, first switch to it. case "$#" in 2) + head=$(git-rev-parse --verify "$2^") || usage git-checkout "$2" || usage esac -- cgit v1.3 From 32d9954478734da4062cf2ffc2faf2d057e47fb6 Mon Sep 17 00:00:00 2001 From: Lukas Sandström Date: Thu, 15 Dec 2005 00:36:35 +0100 Subject: Bugfixes for git-rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix bugs in git-rebase wrt rebasing another branch than the current HEAD, rebasing with a dirty working dir, and rebasing a proper decendant of the target branch. [jc: with a bit of hand-merging] Signed-off-by: Lukas Sandström Signed-off-by: Junio C Hamano --- git-rebase.sh | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index c1619ff140..16d4359830 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -21,32 +21,30 @@ 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 diff=$(git-diff-index --cached --name-status -r HEAD) -case "$different" in +case "$diff" in ?*) echo "$diff" exit 1 ;; esac +# 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 2) - 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") + +# 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." @@ -55,5 +53,14 @@ fi # Rewind the head to "$other" git-reset --hard "$other" + +# 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 "Fast-forwarded $head to $other." + exit 0 +fi + git-format-patch -k --stdout --full-index "$other" ORIG_HEAD | git am --binary -3 -k -- cgit v1.3