[PATCH 2/2] pull: support rebased upstream + fetch + pull --rebase
From: Santi Béjar <hidden>
Date: 2016-06-15 22:47:03
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. Signed-off-by: Santi Béjar <redacted> --- git-pull.sh | 9 +++++++-- t/t5520-pull.sh | 5 ++--- 2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 4b78a0c..f5bef53 100755
--- a/git-pull.sh
+++ b/git-pull.sh@@ -126,8 +126,13 @@ test true = "$rebase" && { . git-parse-remote && reflist="$(get_remote_merge_branch "$@" 2>/dev/null)" && - oldremoteref="$(git rev-parse -q --verify \ - "$reflist")" + num=0 && + while oldremoteref="$(git rev-parse -q --verify "$reflist@{$num}")" + do + test $oldremoteref = $(git merge-base $oldremoteref $curr_branch) && + break + num=$((num+1)) + 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 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.4.rc0.18.g60787.dirty