summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump the builtin http-parserhttp-parser-2Vicent Marti2012-11-122-647/+1079
|
* clar-helpers: Oops, grab pointerVicent Marti2012-11-121-1/+1
|
* Merge remote-tracking branch 'ben/local-transport' into developmentVicent Marti2012-11-1235-104/+277
|\
| * Remove unnecessary progress logicBen Straub2012-11-121-4/+0
| | | | | | | | | | The indexer handles this better than the fetch logic does.
| * Fix error checkBen Straub2012-11-121-1/+1
| |
| * Helpers for local-filesystem remote URLsBen Straub2012-11-095-135/+63
| |
| * Avoid copying duplicate commitsBen Straub2012-11-091-7/+8
| |
| * Local fetch: add testsBen Straub2012-11-0930-0/+124
| |
| * Implement local transport's fetchBen Straub2012-11-092-14/+138
| |
* | Merge pull request #1061 from nulltoken/topic/explicit-head-errorsVicent Martí2012-11-128-4/+52
|\ \ | | | | | | repository: Refine repository_head() error report
| * | repository: Refine repository_head() error reportnulltoken2012-11-127-3/+51
| | |
| * | Fix compilation warningnulltoken2012-11-121-1/+1
|/ /
* | Merge pull request #1010 from ethomson/fetch_headEdward Thomson2012-11-1112-3/+542
|\ \ | | | | | | create FETCH_HEAD specially instead of as a ref file
| * | create FETCH_HEAD specially instead of as a ref fileEdward Thomson2012-11-1112-3/+542
|/ /
* | Merge pull request #1056 from nulltoken/duplicate-tree-entriesVicent Martí2012-11-105-2/+197
|\ \ | | | | | | Duplicate tree entries
| * | index: prevent tree creation from a non merged statenulltoken2012-11-093-2/+54
| | | | | | | | | | | | Fix libgit2/libgit2sharp#243
| * | index: Introduce git_index_has_conflicts()nulltoken2012-11-083-0/+26
| | |
| * | tree: enforce coverage of silent entry replacementnulltoken2012-11-081-0/+117
| |/
* | Merge pull request #1060 from nulltoken/topic/explicit-index-errorsVicent Martí2012-11-104-29/+64
|\ \ | | | | | | Topic/explicit index errors
| * | index: prefer INDEX_OWNER usagenulltoken2012-11-101-1/+1
| | |
| * | index: refine add_from_workdir() error reportnulltoken2012-11-103-24/+48
| | |
| * | index: make git_index_new() work with a NULL pathnulltoken2012-11-102-1/+12
| | |
| * | tests: Add missing assertionsnulltoken2012-11-101-3/+3
|/ /
* | Merge pull request #1058 from pwkelley/developmentVicent Martí2012-11-093-6/+11
|\ \ | | | | | | Fixes for two segfaults
| * | Fix a mutex/critical section leakPhilip Kelley2012-11-091-0/+1
| | |
| * | Fix uninitialized memory in winhttp subtransport on 64-bitPhilip Kelley2012-11-091-1/+4
| | |
| * | Fix implementation of strndup to not overrunPhilip Kelley2012-11-091-5/+6
| | |
* | | Merge pull request #1059 from nulltoken/fix/config-open-levelVicent Martí2012-11-092-2/+13
|\ \ \ | |/ / |/| | config: make git_config_open_level() work with an empty config
| * | config: make git_config_open_level() work with an empty confignulltoken2012-11-092-2/+13
|/ /
* | Merge pull request #1052 from delanne/invalid_readVicent Martí2012-11-092-2/+4
|\ \ | | | | | | Valgrind reports Invalid Read when the configuration file contains some empty line
| * | - Update 'tests-clar/resources/config/config11' in order to reproduce the ↵delanne2012-11-082-2/+4
| | | | | | | | | | | | | | | | | | invalidread with the unittest (just added some \n at the end of the file) - Fix config_file.c
* | | Merge pull request #1057 from bts/patch-1Vicent Martí2012-11-091-4/+11
|\ \ \ | |_|/ |/| | Update documentation in remote.h
| * | Update documentation in remote.hBrian Schroeder2012-11-081-4/+11
|/ /
* | Merge pull request #1048 from pwkelley/basic_authPhilip Kelley2012-11-0811-123/+594
|\ \ | |/ |/| Basic authentication for http and winhttp
| * Don't store no_check_cert; fetch it on demandPhilip Kelley2012-11-062-24/+16
| |
| * Fix connection leak in http subtransportPhilip Kelley2012-11-062-3/+9
| |
| * Basic authentication for http and winhttpPhilip Kelley2012-11-0610-96/+569
| |
* | Merge pull request #1039 from erikvanzijst/erik/tag_without_messageVicent Martí2012-11-0711-7/+52
|\ \ | | | | | | Correctly parse tags lacking a description
| * | tags: Fixed the tag parser to correctly treat the message field as optional.Erik van Zijst2012-11-0211-7/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix makes libgit2 capable of parsing annotated tag objects that lack the optional message/description field. Previously, libgit2 treated this field as mandatory and raised a tag_error on such tags. However, the message field is optional. An example of such a tag is refs/tags/v2.6.16.31-rc1 in Linux: $ git cat-file tag refs/tags/v2.6.16.31-rc1 object afaa018cefb6af63befef1df7d8febaae904434f type commit tag v2.6.16.31-rc1 tagger Adrian Bunk <bunk@stusta.de> 1162716505 +0100 $
* | | Merge pull request #1050 from edubart/developmentBen Straub2012-11-075-3/+49
|\ \ \ | | | | | | | | Fix compilation for mingw32 and cygwin
| * | | Move inet_pton to posix platform-compatibility layerEduardo Bart2012-11-076-52/+49
| | | |
| * | | Fix compilation for mingw32 and cygwinEduardo Bart2012-11-062-2/+51
|/ / / | | | | | | | | | | | | inet_pton is available only in windows vista or later, fixed the issue by reimplementing it using WSAStringToAddress
* | | Merge pull request #1025 from ethomson/fetchodbPhilip Kelley2012-11-067-21/+150
|\ \ \ | |_|/ |/| | fetch: Write packs to the ODB instead of directly to disk
| * | create callback to handle packs from fetch, move the indexer to odb_packEdward Thomson2012-11-057-21/+150
|/ /
* | Merge pull request #1046 from libgit2/empty-remote-url-crashRussell Belfer2012-11-053-2/+18
|\ \ | | | | | | Bail out of remote loading if the URL would be NULL
| * | 'geterr' -> 'giterr'empty-remote-url-crashJustin Spahr-Summers2012-11-051-1/+1
| | |
| * | Revert "Don't expect the 'empty-remote-url' remote to be listed"Justin Spahr-Summers2012-11-051-2/+2
| | | | | | | | | | | | | | | | | | Apparently git_remote_list() includes even remotes for which git_remote_load() would fail. Sorry @nulltoken, false alarm. This reverts commit f358ec143c8c9952227d31cd21c24f8c9be23d3c.
| * | Don't expect the 'empty-remote-url' remote to be listedJustin Spahr-Summers2012-11-051-2/+2
| | | | | | | | | | | | CC @nulltoken
| * | Test for GITERR_INVALIDJustin Spahr-Summers2012-11-051-0/+1
| | |
| * | Set GITERR_INVALID when encountering a NULL remote URLJustin Spahr-Summers2012-11-051-0/+1
| | |
View Lorry Controller Status