Russell Belfer 32def5af9a Fix checkout behavior when its hands are tied ... So, @nulltoken created a failing test case for checkout that proved to be particularly daunting. If checkout is given only a very limited strategy mask (e.g. just GIT_CHECKOUT_CREATE_MISSING) then it is possible for typechange/rename modifications to leave it unable to complete the request. That's okay, but the existing code did not have enough information not to generate an error (at least for tree/blob conflicts). This led me to a significant reorganization of the code to handle the failing case, but it has three benefits: 1. The test case is handled correctly (I think) 2. The new code should actually be much faster than the old code since I decided to make checkout aware of diff list internals. 3. The progress value accuracy is hugely increased since I added a fourth pass which calculates exactly what work needs to be done before doing anything.		2012-11-09 13:52:06 -08:00
..
head.c	Merge pull request #990 from ben/clone-callbacks	2012-10-25 08:16:13 -07:00
index.c	Fix checkout behavior when its hands are tied	2012-11-09 13:52:06 -08:00
tree.c	Fix Windows build	2012-10-25 09:02:55 -07:00
typechange.c	Adjust for rebase	2012-10-19 19:36:22 -07:00