summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanti Béjar <santi@agolina.net>2009-07-19 07:45:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-19 17:29:38 (GMT)
commitd44e71261f91d3cc81293e0976bb40daa8abb583 (patch)
treeafea1b178e05f1bd1e2fb38d62b8691e16261255
parenta418441b4ea2ab69a17636c3020a29394d4c6562 (diff)
downloadgit-d44e71261f91d3cc81293e0976bb40daa8abb583.zip
git-d44e71261f91d3cc81293e0976bb40daa8abb583.tar.gz
git-d44e71261f91d3cc81293e0976bb40daa8abb583.tar.bz2
pull: support rebased upstream + fetch + pull --rebase
You cannot do a "git pull --rebase" with a rebased upstream, if you have already run "git fetch". Try to behave as if the "git fetch" was not run. In other words, find the fork point of the current branch, where the tip of upstream branch used to be, and use it as the upstream parameter of "git rebase". This patch computes the fork point by walking the reflog to find the first commit which is an ancestor of the current branch. Maybe there are smarter ways to compute it, but this is a straight forward implementation. Signed-off-by: Santi Béjar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-pull.sh14
-rwxr-xr-xt/t5520-pull.sh5
2 files changed, 13 insertions, 6 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 4b78a0c..0f24182 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -124,10 +124,18 @@ test true = "$rebase" && {
git diff-index --ignore-submodules --cached --quiet HEAD -- ||
die "refusing to pull with rebase: your working tree is not up-to-date"
+ oldremoteref= &&
. git-parse-remote &&
- reflist="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
- oldremoteref="$(git rev-parse -q --verify \
- "$reflist")"
+ remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
+ oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
+ for reflog in $(git rev-list -g $remoteref 2>/dev/null)
+ do
+ if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
+ then
+ oldremoteref="$reflog"
+ break
+ fi
+ done
}
orig_head=$(git rev-parse -q --verify HEAD)
git fetch $verbosity --update-head-ok "$@" || exit 1
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 3ebc886..e78d402 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -117,15 +117,14 @@ test_expect_success '--rebase with rebased default upstream' '
'
-test_expect_failure 'rebased upstream + fetch + pull --rebase' '
+test_expect_success 'rebased upstream + fetch + pull --rebase' '
git update-ref refs/remotes/me/copy copy-orig &&
git reset --hard to-rebase-orig &&
git checkout --track -b to-rebase3 me/copy &&
git reset --hard to-rebase-orig &&
git fetch &&
- test_must_fail git pull --rebase &&
- git rebase --abort &&
+ git pull --rebase &&
test "conflicting modification" = "$(cat file)" &&
test file = "$(cat file2)"