| commit | 9f992262fb8fdbac94f3a86f6bdf7182aab7feb6 | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Fri, 29 May 2015 11:44:41 +0000 (29 19:44 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2015 16:15:10 +0000 (29 09:15 -0700) | ||
| tree | fb7b3f40abb524703a91ca71377b3b6d99da64bd | treesnapshot (tar.gz zip) |
| parent | 05438afca79176f77aff274a624675bb3b9e231e | commitdiff |
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>
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>
| t/t5520-pull.sh | diffblobblamehistory |