diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:33:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:33:08 -0700 |
| commit | 07d6309e63aa272d2930540faa72147dc5be97a5 (patch) | |
| tree | 90ac260b170f62b92d4169de01f39dfcbf67460e /git-pull.sh | |
| parent | filter-branch: make the usage string fit on 80 chars terminals. (diff) | |
| parent | pull: support rebased upstream + fetch + pull --rebase (diff) | |
| download | git-07d6309e63aa272d2930540faa72147dc5be97a5.tar.gz git-07d6309e63aa272d2930540faa72147dc5be97a5.zip | |
Merge branch 'sb/maint-pull-rebase' into maint
* sb/maint-pull-rebase:
pull: support rebased upstream + fetch + pull --rebase
t5520-pull: Test for rebased upstream + fetch + pull --rebase
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh index 4b78a0cd37..0f24182974 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 |