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/t3033-merge-toplevel.sh | |
| 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/t3033-merge-toplevel.sh')
0 files changed, 0 insertions, 0 deletions