diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:27:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:27:29 -0700 |
| commit | d25c72f7da5116f7b7a1f88a59d2bc14415a03b2 (patch) | |
| tree | 74d5fcea2044616ca648d60004bb24623f62997b /git-pull.sh | |
| parent | 2eb54692d145a0c2939698302e913975f059ac34 (diff) | |
| parent | cf65426de682bf4e336eddd2964a7c1585597f48 (diff) | |
| download | git-d25c72f7da5116f7b7a1f88a59d2bc14415a03b2.tar.gz | |
Merge branch 'en/rebase-against-rebase-fix'
* en/rebase-against-rebase-fix:
pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index a09a44ec4c..8eb74d45de 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -273,6 +273,15 @@ then exit fi +if test true = "$rebase" +then + o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref) + if test "$oldremoteref" = "$o" + then + unset oldremoteref + fi +fi + merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit case "$rebase" in true) |