diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2010-11-13 23:58:22 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 15:06:40 -0800 |
| commit | fe249b4219f66ae3aacfac50ad19b38c370ad115 (patch) | |
| tree | 1856bcb80e9f3306e26f6b325b6a0964ed2c6d1c /t/t5520-pull.sh | |
| parent | 7d43de925b2771d295d8fc4341b7bd544e2a74fa (diff) | |
| download | git-fe249b4219f66ae3aacfac50ad19b38c370ad115.tar.gz git-fe249b4219f66ae3aacfac50ad19b38c370ad115.tar.xz | |
Use reflog in 'pull --rebase . foo'
Since c85c792 (pull --rebase: be cleverer with rebased upstream
branches, 2008-01-26), "git pull --rebase" has used the reflog to try to
rebase from the old upstream onto the new upstream.
Make this work if the local repository is explicitly passed on the
command line as in 'git pull --rebase . foo'.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Acked-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 0b489f5b1..0470a81be 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -222,4 +222,11 @@ test_expect_success 'git pull --rebase does not reapply old patches' ' ) ' +test_expect_success 'git pull --rebase against local branch' ' + git checkout -b copy2 to-rebase-orig && + git pull --rebase . to-rebase && + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" +' + test_done |