summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Sandström <lukass@etek.chalmers.se>2005-12-14 23:36:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-15 01:02:03 (GMT)
commit32d9954478734da4062cf2ffc2faf2d057e47fb6 (patch)
tree538ee453decebb9e661f63d6007be4a7c8abff7f
parente0e3ba208d235ab5623a86204fbd20b449520764 (diff)
downloadgit-32d9954478734da4062cf2ffc2faf2d057e47fb6.zip
git-32d9954478734da4062cf2ffc2faf2d057e47fb6.tar.gz
git-32d9954478734da4062cf2ffc2faf2d057e47fb6.tar.bz2
Bugfixes for git-rebase
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 <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-rebase.sh29
1 files changed, 18 insertions, 11 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index c1619ff..16d4359 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