summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge pull request #2098 from arthurschreiber/arthur/add-git_reference_is_noteVicent Marti2014-02-023-0/+36
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Add `git_reference_is_note`.
| | * | | | | Add `git_reference_is_note`.Arthur Schreiber2014-02-023-0/+36
| |/ / / / /
| * | | | | Merge pull request #2092 from libgit2/rb/update-clarVicent Marti2014-01-311-5/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Update to latest clar
| | * | | | | Update to latest clarRussell Belfer2014-01-311-5/+13
| |/ / / / /
| * | | | | Merge pull request #2081 from libgit2/bs/reflogVicent Marti2014-01-3123-139/+480
| |\ \ \ \ \ | | | | | | | | | | | | | | Reflog completionism
| | * | | | | Allow tests to run without user configBen Straub2014-01-302-0/+12
| | | | | | |
| | * | | | | Enhance testing of signature parametersBen Straub2014-01-307-13/+51
| | | | | | |
| | * | | | | Document branch-creation reflog betterBen Straub2014-01-301-1/+3
| | | | | | |
| | * | | | | Provide good default reflog messages in branch apiBen Straub2014-01-303-9/+65
| | | | | | |
| | * | | | | Ensure moving a branch updates the reflogBen Straub2014-01-301-0/+19
| | | | | | |
| | * | | | | Ensure renaming a reference updates the reflogBen Straub2014-01-307-41/+64
| | | | | | |
| | * | | | | Add reflog parameters to git_branch_moveBen Straub2014-01-303-15/+23
| | | | | | |
| | * | | | | Deleting a branch deletes its reflogBen Straub2014-01-303-20/+29
| | | | | | |
| | * | | | | Augment clone API with reflog parametersBen Straub2014-01-304-15/+74
| | | | | | |
| | * | | | | Add reflog params to git_branch_createBen Straub2014-01-307-23/+35
| | | | | | |
| | * | | | | Add passing reflog testsBen Straub2014-01-301-1/+29
| | | | | | |
| | * | | | | Ensure creating HEAD creates its reflogBen Straub2014-01-301-0/+21
| | | | | | |
| | * | | | | Enhance clarityBen Straub2014-01-301-2/+4
| | | | | | |
| | * | | | | Ensure updating HEAD updates reflogBen Straub2014-01-302-3/+27
| | | | | | |
| | * | | | | Add reflog params to set-head callsBen Straub2014-01-309-45/+73
| |/ / / / /
| * | | | | Merge pull request #2085 from libgit2/rb/index-tree-blob-collisionVicent Marti2014-01-306-23/+263
| |\ \ \ \ \ | | | | | | | | | | | | | | Index tree-bob collision
| | * | | | | Fix checkout NONE to not remove fileRussell Belfer2014-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If you are checking out NONE, then don't remove.
| | * | | | | Rename conflict to collision to prevent confusionRussell Belfer2014-01-301-2/+2
| | | | | | |
| | * | | | | Force explicit remove of files instead of deferRussell Belfer2014-01-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Two-phase index mergingEdward Thomson2014-01-291-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'.
| | * | | | | Give index_isrch the same semantics as index_srchEdward Thomson2014-01-291-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | More index collision testsEdward Thomson2014-01-291-0/+64
| | | | | | |
| | * | | | | index: Implement folder-file checksVicent Marti2014-01-291-52/+50
| | | | | | |
| | * | | | | index: Compare with given lenVicent Marti2014-01-293-13/+127
| | | | | | |
| | * | | | | Add test for blob/tree name collisions in indexRussell Belfer2014-01-291-0/+42
| | | | | | |
| * | | | | | Merge pull request #2091 from libgit2/rb/cleanups-123Vicent Marti2014-01-3018-138/+376
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix errors with zstream (and a variety of other cleanups)
| | * | | | | | Defer zstream NUL termination to endRussell Belfer2014-01-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And don't terminate if there isn't space for it (since it's binary data, it's not worth a reallocation).
| | * | | | | | Expand zstream tests and fix off-by-one errorRussell Belfer2014-01-302-18/+64
| | | | | | | |
| | * | | | | | Reorganize zstream API and fix wrap problemsRussell Belfer2014-01-304-59/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were some confusing issues mixing up the number of bytes written to the zstream output buffer with the number of bytes consumed from the zstream input. This reorganizes the zstream API and makes it easier to deflate an arbitrarily large input while still using a fixed size output.
| | * | | | | | Some fixes for Windows x64 warningsRussell Belfer2014-01-305-7/+7
| | | | | | | |
| | * | | | | | Misc cleanupsRussell Belfer2014-01-303-24/+25
| | | | | | | |
| | * | | | | | Make submodule fetchRecurse match other optionsRussell Belfer2014-01-305-29/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the fetchRecurse compiler warnings and makes the behavior match the other submodule options (i.e. the in-memory setting can be reset to the on-disk value).
| | * | | | | | Some missing oid to id renamesRussell Belfer2014-01-302-21/+25
| |/ / / / / /
| * | | | | | Merge pull request #2089 from scunz/cmake_pathVicent Marti2014-01-292-6/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | We never search for libiconv via pkg-config
| | * | | | | | We never search for libiconv via pkg-configSascha Cunz2014-01-302-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we actually also never know that we can set a dependency on it in pkg-config. Instead always give it the -L and -l options.
| * | | | | | | Merge pull request #2088 from scunz/cmake_pathVicent Marti2014-01-292-16/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | Fixing #2017 and #2087
| | * | | | | Find and use a MacPorts version of libiconv. Fixes #2017.Sascha Cunz2014-01-302-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add correct -I, -L and -l flags - Search for libiconv in /opt/local/[include|lib] before in the system path. See #2017 for details. - Give splitted -L and -l arguments to pkg-config
| | * | | | | Cleanup FindIconv.cmakeSascha Cunz2014-01-301-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't change anything. Just removes stuff that was probably missed to remove when this was imported.
| | * | | | | Use relative path to set cmake module pathSascha Cunz2014-01-301-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has actually no effect on a "normal" build, but allows to use libgit2 as a part of a larger project via CMake's ADD_SUBDIRECTORY() Closes #2087
| * | | | | Merge pull request #2086 from ethomson/fixupVicent Marti2014-01-291-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Don't strcmp a git_buf, strcmp its char *
| | * | | | | Don't strcmp a git_buf, strcmp its char *Edward Thomson2014-01-291-1/+1
| |/ / / / /
| * | | | | Merge pull request #2083 from ↵Vicent Marti2014-01-283-0/+75
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | arthurschreiber/arthur/add-git_commit_descendant_of Add `git_commit_descendant_of`.
| | * | | | | Add `git_graph_descendant_of`.Arthur Schreiber2014-01-283-0/+75
| |/ / / / /
| * | | | | Merge pull request #2066 from libgit2/rb/builtin-diff-driversVicent Marti2014-01-2731-85/+1281
| |\ \ \ \ \ | | | | | | | | | | | | | | Add built in diff drivers
| | * | | | | Add PHP tests and fix bug in PHP builtin driverRussell Belfer2014-01-2714-4/+205
| | | | | | |
View Lorry Controller Status