The problem is that you cannot do a "git pull --rebase" with a rebased
upstream if you have already run "git fetch" before. And the solution:
Try to behaved as if the "git fetch" was not run.
Or in other words, use the fork commit of the current branch (where
the tip of upstream branch used to be) as the upstream parameter of
"git rebase".
Compute it 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 of the above
"Try to behaved as if the "git fetch" was not run".
Signed-off-by: Santi Béjar <santi@xxxxxxxxxxx>
---
Changes since v2:
- Hopefully enhance the commit log
- Use a 'for' loop for the reflog entries
- provide a default value in case there is no reflog
Changed since v1:
- rename reflist to remoteref to better reflect its use
- (( $num + 1 ))
git-pull.sh | 11 +++++++++--
t/t5520-pull.sh | 5 ++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 4b78a0c..c8f1674 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -125,9 +125,16 @@ test true = "$rebase" && {
die "refusing to pull with rebase: your working tree is not up-to-date"
. git-parse-remote &&
- reflist="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
+ remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
+ oldremoteref= &&
+ for reflog in $(git rev-list -g $remoteref 2>/dev/null)
+ do
+ test $reflog = $(git merge-base $reflog $curr_branch) &&
+ oldremoteref=$reflog && break
+ done
+ [ -z "$oldremoteref" ] &&
oldremoteref="$(git rev-parse -q --verify \
- "$reflist")"
+ "$remoteref")"
}
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 1aae494..37a7e33 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)
--
1.6.3.2.408.g8ecf
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html