diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-05-02 23:37:12 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-03 11:15:01 -0700 |
| commit | a54e4e1ab6c00a1e39b4dd88d64fccc5a4923c40 (patch) | |
| tree | 9e509eb9fffe5591152416b2774391ff0c03cde6 | |
| parent | 6e18549ad7492dc4810ad7ed14379da5764638ad (diff) | |
| download | git-a54e4e1ab6c00a1e39b4dd88d64fccc5a4923c40.tar.gz | |
t5520: test work tree fast-forward when fetch updates head
Since commit b10ac50f (Fix pulling into the same branch), git-pull,
upon detecting that git-fetch updated the current head, will
fast-forward the working tree to the updated head commit.
Implement tests to ensure that the fast-forward occurs in such a case,
as well as to ensure that the user-friendly advice is printed upon
failure.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5520-pull.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 9f57e0d0b2..25d519d35e 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -189,6 +189,27 @@ test_expect_success 'fail if the index has unresolved entries' ' test_i18ngrep "You have not concluded your merge" out ' +test_expect_success 'fast-forwards working tree if branch head is updated' ' + git checkout -b third master^ && + test_when_finished "git checkout -f copy && git branch -D third" && + echo file >expected && + test_cmp expected file && + git pull . second:third 2>out && + test_i18ngrep "fetch updated the current branch head" out && + echo modified >expected && + test_cmp expected file +' + +test_expect_success 'fast-forward fails with conflicting work tree' ' + git checkout -b third master^ && + test_when_finished "git checkout -f copy && git branch -D third" && + echo file >expected && + test_cmp expected file && + echo conflict >file && + test_must_fail git pull . second:third 2>out && + test_i18ngrep "Cannot fast-forward your working tree" out +' + test_expect_success '--rebase' ' git branch to-rebase && echo modified again > file && |