diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-05-29 19:44:41 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-05-29 09:15:10 -0700 |
| commit | 9f992262fb8fdbac94f3a86f6bdf7182aab7feb6 (patch) | |
| tree | fb7b3f40abb524703a91ca71377b3b6d99da64bd /t | |
| parent | t5520: test for failure if index has unresolved entries (diff) | |
| download | tgif-9f992262fb8fdbac94f3a86f6bdf7182aab7feb6.tar.xz | |
t5520: test work tree fast-forward when fetch updates head
Since b10ac50 (Fix pulling into the same branch., 2005-08-25), 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>
Diffstat (limited to 't')
| -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 265c693b51..872d765b5c 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -183,6 +183,27 @@ test_expect_success 'fail if the index has unresolved entries' ' test_cmp expected file ' +test_expect_success 'fast-forwards working tree if branch head is updated' ' + git checkout -b third second^ && + test_when_finished "git checkout -f copy && git branch -D third" && + test "$(cat file)" = file && + git pull . second:third 2>err && + test_i18ngrep "fetch updated the current branch head" err && + test "$(cat file)" = modified && + test "$(git rev-parse third)" = "$(git rev-parse second)" +' + +test_expect_success 'fast-forward fails with conflicting work tree' ' + git checkout -b third second^ && + test_when_finished "git checkout -f copy && git branch -D third" && + test "$(cat file)" = file && + echo conflict >file && + test_must_fail git pull . second:third 2>err && + test_i18ngrep "Cannot fast-forward your working tree" err && + test "$(cat file)" = conflict && + test "$(git rev-parse third)" = "$(git rev-parse second)" +' + test_expect_success '--rebase' ' git branch to-rebase && echo modified again > file && |