- 30 Jan, 2014 3 commits
-
-
If you are checking out NONE, then don't remove.
Russell Belfer committed -
Russell Belfer committed
-
The checkout code used to defer removal of "blocking" files in checkouts until the blocked item was actually being written (since we have already checked that the removing the block is acceptable according to the update rules). Unfortunately, this resulted in an intermediate index state where both the blocking and new items were in the index which is no longer allowed. Now we just remove the blocking item in the first pass so it never needs to coexist. In cases where there are typechanges, this could result in a bit more churn of removing and recreating intermediate directories, but I'm going to assume that is an unusual case and the churn will not be too costly.
Russell Belfer committed
-
- 29 Jan, 2014 8 commits
-
-
When three-way merging indexes, we previously changed each path as we read them, which would lead to us adding an index entry for 'foo', then removing an index entry for 'foo/file'. With the new index requirements, this is not allowed. Removing entries in the merged index, then adding them, resolves this. In the previous example, we now remove 'foo/file' before adding 'foo'.
Edward Thomson committed -
In case insensitive index mode, we would stop at a prefixed entry, treating the provided search key length as a substring, not the length of the string to match.
Edward Thomson committed -
Edward Thomson committed
-
Vicent Marti committed
-
Vicent Marti committed
-
Russell Belfer committed
-
Don't strcmp a git_buf, strcmp its char *
Vicent Marti committed -
Edward Thomson committed
-
- 28 Jan, 2014 2 commits
-
-
Add `git_commit_descendant_of`.
Vicent Marti committed -
Arthur Schreiber committed
-
- 27 Jan, 2014 16 commits
-
-
Add built in diff drivers
Vicent Marti committed -
Russell Belfer committed
-
Writing a sample Javascript driver pointed out some extra whitespace handling that needed to be done in the diff driver. This adds some tests with some sample javascript code that I pulled off of GitHub just to see what would happen. Also, to clean up the userdiff test data, I did a "git gc" and packed up the test objects.
Russell Belfer committed -
Russell Belfer committed
-
Leftover OID -> ID changes
Vicent Marti committed -
Buff up returning strings
Vicent Marti committed -
MSVC doesn't like modern code neither
Vicent Marti committed -
Make blame example compile on MSVC
Vicent Marti committed -
Linquize committed
-
Linquize committed
-
Carlos Martín Nieto committed
-
Carlos Martín Nieto committed
-
A lot of the tests were checking for overflow, which we don't have anymore, so we can remove them.
Carlos Martín Nieto committed -
Again, we already did this internally, so simply remove the conversions.
Carlos Martín Nieto committed -
Internally we already did everything with git_bufs, so this is just exposing those functions with public names.
Carlos Martín Nieto committed -
Since we now export that type, we can avoid making the user guess a size.
Carlos Martín Nieto committed
-
- 26 Jan, 2014 6 commits
-
-
Fix git_remote_dup & add missing const
Ben Straub committed -
Arthur Schreiber committed
-
Arthur Schreiber committed
-
Fix write_object.
Edward Thomson committed -
Fix local push to file:// URL.
Edward Thomson committed -
XTao committed
-
- 25 Jan, 2014 5 commits
-
-
Following the rest of the series, use 'id' when refering to the value.
Carlos Martín Nieto committed -
Same as the other commits in the series, we use 'id' when talking about thing rather than the datatype.
Carlos Martín Nieto committed -
In the same vein as the previous commits in this series.
Carlos Martín Nieto committed -
Rename git_tree_entry_byoid() to _byid() as per the convention.
Carlos Martín Nieto committed -
Carlos Martín Nieto committed
-