summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refdb: disable concurrent compress in the threading tests on Windowscmn/windows-no-concurrent-compressCarlos Martín Nieto2016-12-121-2/+8
* Merge pull request #4020 from novalis/rebase-detachedEdward Thomson2016-12-072-1/+54
|\
| * git_rebase_init: correctly handle detached HEADDavid Turner2016-12-012-1/+54
* | Merge pull request #4014 from bokic/patch-1Edward Thomson2016-12-071-1/+1
|\ \
| * | Properly pass `wchar *` type to giterr_setBoris Barbulovski2016-12-061-1/+1
| * | Properly pass `wchar *` type to giterr_setBoris Barbulovski2016-11-201-1/+1
| |/
* | Merge pull request #4022 from josharian/patch-1Edward Thomson2016-12-041-1/+1
|\ \ | |/ |/|
| * remote: fix typo in git_fetch_init_options docsJosh Bleecher Snyder2016-12-021-1/+1
|/
* Merge pull request #4010 from libgit2/ethomson/clar_threadsCarlos Martín Nieto2016-11-188-12/+122
|\
| * tests: handle life without threadsethomson/clar_threadsEdward Thomson2016-11-182-2/+12
| * threads::refdb tests: use new threaded clar assertEdward Thomson2016-11-181-10/+14
| * clar: Introduce assertion helpers for threadsEdward Thomson2016-11-181-0/+41
| * core::init tests: reverse init/shutdownEdward Thomson2016-11-181-2/+2
| * threads: introduce `git_thread_exit`Edward Thomson2016-11-185-0/+55
* | Merge pull request #4009 from pranitbauva1997/fix-string-formatCarlos Martín Nieto2016-11-172-2/+2
|\ \ | |/ |/|
| * use `giterr_set_str()` wherever possiblePranit Bauva2016-11-172-2/+2
|/
* Merge pull request #4007 from libgit2/cmn/bump-v25v0.25.0-rc1Carlos Martín Nieto2016-11-152-4/+15
|\
| * Bump version number to v0.25cmn/bump-v25Carlos Martín Nieto2016-11-152-4/+15
* | Merge pull request #4008 from pks-t/pks/sortedcache-fd-leakCarlos Martín Nieto2016-11-152-1/+4
|\ \
| * | patch_parse: fix memory leakPatrick Steinhardt2016-11-151-1/+3
| * | sortedcache: plug leaked file descriptorPatrick Steinhardt2016-11-151-0/+1
* | | Merge pull request #3996 from pks-t/pks/curl-lastsocket-deprecationCarlos Martín Nieto2016-11-151-3/+14
|\ \ \ | |_|/ |/| |
| * | curl_stream: use CURLINFO_ACTIVESOCKET if curl is recent enoughPatrick Steinhardt2016-11-151-3/+14
* | | Merge pull request #3962 from libgit2/ethomson/issue_templateCarlos Martín Nieto2016-11-151-0/+14
|\ \ \
| * | | Introduce a GitHub Issue Templateethomson/issue_templateEdward Thomson2016-11-141-0/+14
* | | | Merge pull request #4004 from libgit2/cmn/changelogCarlos Martín Nieto2016-11-151-2/+63
|\ \ \ \ | |_|_|/ |/| | |
| * | | CHANGELOG: fill in some updates we missedcmn/changelogCarlos Martín Nieto2016-11-141-2/+63
* | | | Merge pull request #4006 from libgit2/cmn/compress-buf-freeEdward Thomson2016-11-141-0/+2
|\ \ \ \
| * | | | Plug a leak in the refs compressorcmn/compress-buf-freeCarlos Martín Nieto2016-11-141-0/+2
| |/ / /
* | | | Merge pull request #3998 from pks-t/pks/repo-discoveryCarlos Martín Nieto2016-11-142-57/+105
|\ \ \ \
| * | | | repository: do not interpret all files as gitlinks in discoveryPatrick Steinhardt2016-11-142-1/+11
| * | | | test: discover: fix indentationPatrick Steinhardt2016-11-141-1/+1
| * | | | test: discover: split up monolithic test into smaller onesPatrick Steinhardt2016-11-141-49/+67
| * | | | test: discover: pass constants to ensure_repository_discoverPatrick Steinhardt2016-11-141-19/+26
| * | | | test: discover: move layout creation into test initializerPatrick Steinhardt2016-11-141-22/+35
* | | | | Merge pull request #4003 from libgit2/cmn/tree-updater-orderingEdward Thomson2016-11-142-2/+62
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | tree: look for conflicts in the new tree when updatingcmn/tree-updater-orderingCarlos Martín Nieto2016-11-141-0/+3
| * | | | tree: use the sorted update list in our loopCarlos Martín Nieto2016-11-141-2/+2
| * | | | tree: add a failing test for unsorted inputCarlos Martín Nieto2016-11-141-0/+57
| |/ / /
* | | | Merge pull request #3561 from libgit2/cmn/refdb-paraEdward Thomson2016-11-146-148/+185
|\ \ \ \ | |/ / / |/| | |
| * | | refdb: use a constant for the number of per-thread creations/deletescmn/refdb-paraCarlos Martín Nieto2016-11-141-6/+8
| * | | refdb: bubble up locked files on the read sideCarlos Martín Nieto2016-11-144-23/+42
| * | | refdb: expect threaded test deletes to raceCarlos Martín Nieto2016-11-141-0/+4
| * | | refdb: remove a check-delete race when removing a loose refCarlos Martín Nieto2016-11-141-7/+7
| * | | sortedcache: check file size after opening the fileCarlos Martín Nieto2016-11-141-5/+13
| * | | refdb: add retry logic to the threaded testsCarlos Martín Nieto2016-11-141-5/+13
| * | | refdb: bubble up the error code when compressing the dbCarlos Martín Nieto2016-11-141-4/+5
| * | | refdb: refactor the lockfile cleanupCarlos Martín Nieto2016-11-141-15/+9
| * | | refdb: don't report failure for expected errorsCarlos Martín Nieto2016-11-141-20/+9
| * | | fileops: save errno and report file existenceCarlos Martín Nieto2016-11-141-1/+9