[PATCHv2 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
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCHv2 2/2] pull: support rebased upstream + fetch + pull --rebase · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCHv2 2/2] pull: support rebased upstream + fetch + pull --rebase · Santi Béjar <hidden>
- 2016-06-15 · Re: [PATCHv2 2/2] pull: support rebased upstream + fetch + pull --rebase · Santi Béjar <hidden>
- 2016-06-15 · Re: [PATCHv2 2/2] pull: support rebased upstream + fetch + pull --rebase · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCHv2 2/2] pull: support rebased upstream + fetch + pull --rebase · Santi Béjar <hidden>
and here the interdiff between v1 and v2. Santi
diff --git a/git-pull.sh b/git-pull.sh
index f5bef53..31d3945 100755
--- a/git-pull.sh
+++ b/git-pull.sh@@ -125,13 +125,13 @@ 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)" && num=0 && - while oldremoteref="$(git rev-parse -q --verify "$reflist@{$num}")" + while oldremoteref="$(git rev-parse -q --verify "$remoteref@{$num}")" do test $oldremoteref = $(git merge-base $oldremoteref $curr_branch) && break - num=$((num+1)) + num=$(( $num + 1 )) done } orig_head=$(git rev-parse -q --verify HEAD)