| commit | 05438afca79176f77aff274a624675bb3b9e231e | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Fri, 29 May 2015 11:44:40 +0000 (29 19:44 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2015 16:14:52 +0000 (29 09:14 -0700) | ||
| tree | 9bf75c1b847b8610ea57a45d06f2b05497168175 | treesnapshot (tar.gz zip) |
| parent | d12f455e44bc3c90bf06b7123cebe0c82a039c63 | commitdiff |
t5520: test for failure if index has unresolved entries
Commit d38a30d (Be more user-friendly when refusing to do something
because of conflict., 2010-01-12) introduced code paths to git-pull
which will error out with user-friendly advices if the user is in the
middle of a merge or has unmerged files.
Implement tests to ensure that git-pull will not run, and will print
these advices, if the user is in the middle of a merge or has unmerged
files in the index.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit d38a30d (Be more user-friendly when refusing to do something
because of conflict., 2010-01-12) introduced code paths to git-pull
which will error out with user-friendly advices if the user is in the
middle of a merge or has unmerged files.
Implement tests to ensure that git-pull will not run, and will print
these advices, if the user is in the middle of a merge or has unmerged
files in the index.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5520-pull.sh | diffblobblamehistory |