]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 05438af) | patch
t5520: test work tree fast-forward when fetch updates head
authorPaul Tan <pyokagan@gmail.com>
Fri, 29 May 2015 11:44:41 +0000 (19:44 +0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 May 2015 16:15:10 +0000 (09:15 -0700)
commit9f992262fb8fdbac94f3a86f6bdf7182aab7feb6
treefb7b3f40abb524703a91ca71377b3b6d99da64bdtree | snapshot
parent05438afca79176f77aff274a624675bb3b9e231ecommit | diff
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>
t/t5520-pull.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.