summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix off-by-one like in 8060cdc93cc185e9a71c1aa17091dc0a5ab14457 of upstreamHEADfixupsDaniel Silverstone2014-05-291-2/+2
|
* Add missing accessor for fetchRecurseSubmodulesdevelopmentRussell Belfer2012-09-071-0/+20
| | | | | | 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-061-0/+5
|\ | | | | Expose a malloc function to 3rd party ODB backends
| * Expose a malloc function to 3rd party ODB backendsPhilip Kelley2012-08-271-0/+5
| |
* | 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-061-4/+4
| | |
* | | Fix comments and a minor bugRussell Belfer2012-09-051-4/+3
| | | | | | | | | | | | | | | 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-0512-274/+809
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #856 from libgit2/utf8-winVicent Martí2012-09-047-229/+134
|\ \ \ | | | | | | | | Windows: Perform UTF-8 path conversion on the Stack
| * | | Add bounds checking to UTF-8 conversionVicent Marti2012-08-287-67/+42
| | | |
| * | | windows: Keep UTF-8 on the stack yoVicent Marti2012-08-286-236/+74
| | | |
| * | | UTF-8 changes yoVicent Martí2012-08-281-0/+92
| | | |
* | | | odb: pass the user's data pointer correctly in foreachCarlos Martín Nieto2012-09-041-1/+1
| | | |
* | | | Fix MSVC compilation warningsnulltoken2012-09-042-2/+2
| |/ / |/| |
* | | repository: make initialization cope with missing core.worktreenulltoken2012-08-291-2/+2
|/ /
* | 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-273-17/+23
|\ \ | | | | | | | | | | | | Conflicts: include/git2/refs.h
| * | branch: Change `git_branch_delete` to take a refVicent Marti2012-08-262-17/+21
| | |
| * | posix: Always set a default mapping modeVicent Marti2012-08-261-0/+2
| |/
* | Merge pull request #904 from arrbee/better-object-peelVicent Martí2012-08-273-66/+32
|\ \ | | | | | | Make git_object_peel a bit smarter
| * | Make git_object_peel a bit smarterRussell Belfer2012-08-273-66/+32
| |/ | | | | | | | | | | | | | | | | | | | | 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-271-38/+70
|\ \ | | | | | | refs: expose git_reference_normalize_name()
| * | refs: expose git_reference_normalize_name()nulltoken2012-08-271-38/+70
| | |
* | | Merge pull request #899 from schu/revwalk-pushVicent Martí2012-08-271-6/+14
|\ \ \ | | | | | | | | revwalk: refuse push of non-commit objects
| * | | revwalk: refuse push of non-commit objectsMichael Schubert2012-08-271-6/+14
| | |/ | |/| | | | | | | | | | 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-262-18/+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-251-3/+0
|\ \ | | | | | | Revparse: GIT_EAMBIGUOUS
| * | Revparse: GIT_EAMBIGUOUSBen Straub2012-08-251-3/+0
| | | | | | | | | | | | 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-249-13/+169
|\ \ \ | | | | | | | | Add sideband support
| * | | network: add sideband supportCarlos Martín Nieto2012-08-248-12/+155
| | | | | | | | | | | | | | | | | | | | This lets us notify the user of what the remote end is doing while we wait for it to start sending us the packfile.
| * | | indexer: recognize and mark when all of the packfile has been downloadedCarlos Martín Nieto2012-08-242-2/+15
| | | | | | | | | | | | | | | | | | | | We can't always rely on the network telling us when the download is finished. Recognize it from the indexer itself.
* | | | Merge pull request #852 from arrbee/submodule-extensionsVicent Martí2012-08-2412-241/+1485
|\ \ \ \ | | | | | | | | | | Submodule extensions
| * | | | Fix valgrind warnings and spurious error messagesRussell Belfer2012-08-244-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just clean up valgrind warnings about uninitialized memory and also clear out errno in some cases where it results in a false error message being generated at a later point.
| * | | | Working implementation of git_submodule_statusRussell Belfer2012-08-245-210/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a big redesign of the git_submodule_status API and the implementation of the redesigned API. It also fixes a number of bugs that I found in other parts of the submodule API while writing the tests for the status part. This also fixes a couple of bugs in the iterators that had not been noticed before - one with iterating when there is a gitlink (i.e. separate-work-dir) and one where I was treating anything even vaguely submodule-like as a submodule, more aggressively than core git does.
| * | | | Fix valgrind issues and leaksRussell Belfer2012-08-244-128/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes up a number of problems flagged by valgrind and also cleans up the internal `git_submodule` allocation handling overall with a simpler model.
| * | | | Major submodule rewriteRussell Belfer2012-08-245-144/+1351
| | | | | | | | | | | | | | | | | | | | | | | | | This replaces the old submodule API with a new extended API that supports most of the things that can be done with `git submodule`.
* | | | | Support new config locationsRussell Belfer2012-08-244-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | As of git v1.7.12, $HOME/.config/git/ is supported as a new location for "config", "attributes", and "ignore" files.
* | | | | Fix memory leak in cp_rRussell Belfer2012-08-241-0/+1
| |_|_|/ |/| | |
* | | | Fix crash with adding internal ignoresRussell Belfer2012-08-241-8/+12
|/ / / | | | | | | | | | | | | | | | Depending on what you had done before adding new items to the internal ignores list, it was possible for the cache of ignore data to be uninitialized.
* | | Fix errors on Win32 with new repo initRussell Belfer2012-08-242-5/+8
|/ /
View Lorry Controller Status