summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix off-by-one like in 8060cdc93cc185e9a71c1aa17091dc0a5ab14457 of upstreamHEADfixupsDaniel Silverstone2014-05-291-2/+2
|
* Add -lssl to the pkgconfig in case we're linking staticallyDaniel Silverstone2012-09-081-1/+1
|
* Add missing accessor for fetchRecurseSubmodulesdevelopmentRussell Belfer2012-09-073-0/+60
| | | | | | When `git_submodule` became an opaque structure, I forgot to add accessor functions for the fetchRecurseSubmodules config setting. This fixes that.
* odb: mark unused variableMichael Schubert2012-09-061-0/+1
|
* Merge pull request #900 from pwkelley/developmentVicent Martí2012-09-062-0/+11
|\ | | | | Expose a malloc function to 3rd party ODB backends
| * Expose a malloc function to 3rd party ODB backendsPhilip Kelley2012-08-272-0/+11
| |
* | Merge pull request #912 from schu/netops-ssl-errorVicent Martí2012-09-061-2/+38
|\ \ | | | | | | netops: be more careful with SSL errors
| * | netops: be more careful with SSL errorsMichael Schubert2012-09-041-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | SSL_get_error() allows to receive a result code for various SSL operations. Depending on the return value (see man (3) SSL_get_error) there might be additional information in the OpenSSL error queue. Return the queued message if available, otherwise set an error message corresponding to the return code.
| * | netops: continue writing on SSL_ERROR_WANT_WRITEMichael Schubert2012-09-041-1/+1
| | |
* | | diff: Cleanup documentation and printf compatVicent Marti2012-09-062-5/+16
| | |
* | | Merge remote-tracking branch 'arrbee/diff-iterator' into developmentVicent Marti2012-09-0625-570/+1549
|\ \ \
| * | | Fix comments and a minor bugRussell Belfer2012-09-052-38/+103
| | | | | | | | | | | | | | | | | | | | This adds better header comments and also fixes a bug in one of simple APIs that tells the number of lines in the current hunk.
| * | | Diff iteratorsRussell Belfer2012-09-0525-570/+1484
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the diff output code so that an iterator object can be used to traverse and generate the diffs, instead of just the `foreach()` style with callbacks. The code has been rearranged so that the two styles can still share most functions. This also replaces `GIT_REVWALKOVER` with `GIT_ITEROVER` and uses that as a common error code for marking the end of iteration when using a iterator style of object.
* | | | Merge pull request #917 from arrbee/test-issue-835Russell Belfer2012-09-052-1/+8
|\ \ \ \ | |/ / / |/| | | Test for gitmodules only submodule def
| * | | Test for gitmodules only submodule defRussell Belfer2012-09-052-1/+8
|/ / / | | | | | | | | | | | | | | | This should confirm that issue #835 is fixed where a submodule that is only declared in the .gitmodules file was not accessible via the submodule APIs.
* | | Merge pull request #856 from libgit2/utf8-winVicent Martí2012-09-049-301/+147
|\ \ \ | | | | | | | | Windows: Perform UTF-8 path conversion on the Stack
| * | | Add bounds checking to UTF-8 conversionVicent Marti2012-08-288-70/+45
| | | |
| * | | windows: Keep UTF-8 on the stack yoVicent Marti2012-08-288-308/+87
| | | |
| * | | UTF-8 changes yoVicent Martí2012-08-281-0/+92
| | | |
* | | | branch: Add missing includeVicent Marti2012-09-041-0/+1
| | | |
* | | | odb: pass the user's data pointer correctly in foreachCarlos Martín Nieto2012-09-041-1/+1
| | | |
* | | | travis: use a valgrind suppressions fileCarlos Martín Nieto2012-09-042-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't care about the supposed zlib errors, and the leak from giterr_set isn't interesting, as it gets freed each time an error is set. Give valgrind a suppressions file so it doesn't tell us about them.
* | | | clar: Clear errors on shutdownVicent Marti2012-09-041-0/+1
| | | |
* | | | Merge pull request #913 from nulltoken/fix/warningsVicent Martí2012-09-042-2/+2
|\ \ \ \ | |_|/ / |/| | | Fix MSVC compilation warnings
| * | | Fix MSVC compilation warningsnulltoken2012-09-042-2/+2
|/ / /
* | | Ignore tags fileBen Straub2012-08-301-0/+1
| | |
* | | Merge pull request #908 from nulltoken/bug/repo_reinit_initRussell Belfer2012-08-292-2/+17
|\ \ \ | |/ / |/| | repository: add failing repo initialization test
| * | repository: make initialization cope with missing core.worktreenulltoken2012-08-292-2/+17
|/ /
* | Merge pull request #905 from carlosmn/signature-nowVicent Martí2012-08-281-10/+12
|\ \ | | | | | | signature: make the OS give us the offset for git_signature_now
| * | signature: make the OS give us the offset for git_signature_nowCarlos Martín Nieto2012-08-281-10/+12
| | | | | | | | | | | | | | | | | | There is a better and less fragile way to calculate time offsets. Let the OS take care of dealing with DST and simply take the the offset between the local time and UTC that it gives us.
* | | Fix parentheses warningMichael Schubert2012-08-281-1/+2
|/ /
* | ssl: make cert check ignore work for invalid certs, not just CNsCarlos Martín Nieto2012-08-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | Passing SSL_VERIFY_PEER makes OpenSSL shut down the connection if the certificate is invalid, without giving us a chance to ignore that error. Pass SSL_VERIFY_NONE and call SSL_get_verify_result if the user wanted us to check. When no CNs match, we used to jump to on_error which gave a bogus error as that's for OpenSSL errors. Jump to cert_fail so we tell the user that the error came from checking the certificate.
* | Merge branch 'branch-delete-ref' into developmentVicent Marti2012-08-276-56/+55
|\ \ | | | | | | | | | | | | Conflicts: include/git2/refs.h
| * | branch: Change `git_branch_delete` to take a refVicent Marti2012-08-265-56/+51
| | |
| * | posix: Always set a default mapping modeVicent Marti2012-08-261-0/+2
| |/
* | Merge pull request #904 from arrbee/better-object-peelVicent Martí2012-08-276-74/+53
|\ \ | | | | | | Make git_object_peel a bit smarter
| * | Make git_object_peel a bit smarterRussell Belfer2012-08-276-74/+53
| |/ | | | | | | | | | | | | | | | | | | | | This expands the types of peeling that `git_object_peel` knows how to do to include TAG -> BLOB peeling, and makes the errors slightly more consistent depending on the situation. It also adds a new special behavior where peeling to ANY will peel until the object type changes (e.g. chases TAGs to a non-TAG). Using this expanded peeling, this replaces peeling code that was embedded in `git_tag_peel` and `git_reset`.
* | Merge pull request #897 from nulltoken/topic/git_reference_check_formatVicent Martí2012-08-273-153/+349
|\ \ | | | | | | refs: expose git_reference_normalize_name()
| * | refs: expose git_reference_normalize_name()nulltoken2012-08-273-153/+349
| | |
* | | Merge pull request #899 from schu/revwalk-pushVicent Martí2012-08-272-6/+22
|\ \ \ | | | | | | | | revwalk: refuse push of non-commit objects
| * | | revwalk: refuse push of non-commit objectsMichael Schubert2012-08-272-6/+22
| | |/ | |/| | | | | | | | | | Check the type of the pushed object immediately instead of starting the walk and failing in between.
* | | Merge pull request #903 from nulltoken/topic/peeling-duplicationRussell Belfer2012-08-271-25/+3
|\ \ \ | |/ / |/| | branch: reduce code duplication
| * | branch: reduce code duplicationnulltoken2012-08-271-25/+3
| |/
* | indexer: kill git_indexer_stats.data_receivedCarlos Martín Nieto2012-08-263-19/+4
| | | | | | | | | | | | | | It's not really needed with the current code as we have EOS and the sideband's flush to tell us we're done. Keep the distinction between processed and received objects.
* | http: increase buffer side to deal with side-band-64kCarlos Martín Nieto2012-08-251-1/+1
| | | | | | | | This poor transport was forgotten in the recent sideband support.
* | indexer: don't segfault when freeing an unused indexerCarlos Martín Nieto2012-08-251-3/+5
| | | | | | | | | | Make sure that idx->pack isn't NULL before trying to free resources under it.
* | Merge pull request #896 from ben/revparse-ambiguousVicent Martí2012-08-252-3/+9
|\ \ | | | | | | Revparse: GIT_EAMBIGUOUS
| * | Revparse: GIT_EAMBIGUOUSBen Straub2012-08-252-3/+9
| | | | | | | | | | | | Revparse now returns EAMBIGUOUS if the the spec doesn't match any refs/tags, and is <4 characters.
* | | Merge pull request #895 from carlosmn/sidebandVicent Martí2012-08-2412-15/+185
|\ \ \ | | | | | | | | Add sideband support
| * | | examples: add progress output to fetchCarlos Martín Nieto2012-08-241-1/+13
| | | |
View Lorry Controller Status