summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #4002 from pks-t/pks/giterr-formatCarlos Martín Nieto2016-11-1410-43/+44
|\
| * path: pass string instead of git_buf to giterr_setPatrick Steinhardt2016-11-141-1/+1
| * checkout: pass string instead of git_buf to `giterr_set`Patrick Steinhardt2016-11-141-2/+2
| * common: cast precision specifiers to intPatrick Steinhardt2016-11-142-3/+3
| * common: use PRIuZ for size_t in `giterr_set` callsPatrick Steinhardt2016-11-145-36/+36
| * common: mark printf-style formatting for `giterr_set`Patrick Steinhardt2016-11-141-1/+2
* | Merge pull request #3983 from pks-t/pks/smart-early-eofCarlos Martín Nieto2016-11-142-3/+7
|\ \
| * | transports: smart: abort receiving packets on end of streamPatrick Steinhardt2016-11-021-1/+5
| * | transports: smart: abort ref announcement on early end of streamPatrick Steinhardt2016-11-021-1/+1
| * | proxy: fix typo in documentationPatrick Steinhardt2016-11-011-1/+1
* | | Merge pull request #3985 from libgit2/cmn/threading-updateCarlos Martín Nieto2016-11-141-22/+24
|\ \ \
| * | | THREADING: OpenSSL 1.1 is thead-safe, rework some paragraphscmn/threading-updateCarlos Martín Nieto2016-11-041-22/+24
| * | | THREADING: update cURL thread safety linkCarlos Martín Nieto2016-11-021-1/+1
* | | | Merge pull request #3992 from joshtriplett/env-namespacePatrick Steinhardt2016-11-141-5/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | git_repository_open_ext: fix handling of $GIT_NAMESPACEJosh Triplett2016-11-111-5/+8
* | | | Merge pull request #4001 from pks-t/pks/fileops-docs-typoPatrick Steinhardt2016-11-141-2/+2
|\ \ \ \
| * | | | fileops: fix typos in `git_futils_creat_locked{,with_path}`Patrick Steinhardt2016-11-141-2/+2
|/ / / /
* | | | Merge pull request #3993 from alexcrichton/fix-faultPatrick Steinhardt2016-11-111-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | curl_stream: check for -1 after CURLINFO_LASTSOCKETAlex Crichton2016-11-111-0/+6
|/ / /
* | | Merge pull request #3974 from libgit2/pks/synchronize-shutdownPatrick Steinhardt2016-11-042-4/+59
|\ \ \
| * | | tests: core: test deinitialization and concurrent initializationpks/synchronize-shutdownPatrick Steinhardt2016-11-021-0/+40
| * | | global: reset global state on shutdown without threadingPatrick Steinhardt2016-11-021-1/+2
| * | | global: synchronize initialization and shutdown with pthreadsPatrick Steinhardt2016-11-011-3/+17
| | |/ | |/|
* | | Merge pull request #3977 from jfultz/fix-forced-branch-creation-on-bare-repoPatrick Steinhardt2016-11-042-5/+30
|\ \ \ | |_|/ |/| |
| * | branch: fix forced branch creation on HEAD of a bare repoJohn Fultz2016-11-042-5/+30
* | | Merge pull request #3960 from ignatenkobrain/openssl-1.1.0Carlos Martín Nieto2016-11-022-25/+150
|\ \ \
| * | | openssl: include OpenSSL headers only when we're buliding against itCarlos Martín Nieto2016-11-021-6/+10
| * | | openssl: use ASN1_STRING_get0_data when compiling against 1.1Carlos Martín Nieto2016-11-022-2/+7
| * | | openssl: recreate the OpenSSL 1.1 BIO interface for older versionsCarlos Martín Nieto2016-11-022-55/+134
| * | | add support for OpenSSL 1.1.0 for BIO filterIgor Gnatenko2016-10-121-0/+37
* | | | Merge pull request #3984 from pks-t/pks/pack-find-offset-raceCarlos Martín Nieto2016-11-021-5/+5
|\ \ \ \
| * | | | pack: fix race in pack_entry_find_offsetPatrick Steinhardt2016-11-021-5/+5
|/ / / /
* | | | Merge pull request #3976 from pks-t/pks/pqueue-null-derefPatrick Steinhardt2016-11-022-2/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | pqueue: resolve possible NULL pointer dereferencePatrick Steinhardt2016-10-282-2/+25
| | |/ | |/|
* | | Merge pull request #3975 from pks-t/pks/ci-improvementsCarlos Martín Nieto2016-11-012-11/+7
|\ \ \
| * | | travis: do not allow valgrind failuresPatrick Steinhardt2016-10-311-3/+0
| * | | coverity: check for Coverity token only if necessaryPatrick Steinhardt2016-10-311-3/+3
| * | | coverity: only analyze the master branch of the main repositoryPatrick Steinhardt2016-10-281-3/+3
| * | | coverity: fix download URLPatrick Steinhardt2016-10-281-2/+1
| |/ /
* | | Merge pull request #3978 from pks-t/pks/doc-improvementsEdward Thomson2016-10-313-7/+7
|\ \ \ | |/ / |/| |
| * | openssl_stream: fix typoPatrick Steinhardt2016-10-311-1/+1
| * | PROJECTS: consistently quote directoriesPatrick Steinhardt2016-10-311-3/+3
| * | Documentation: fix small typosPatrick Steinhardt2016-10-312-3/+3
|/ /
* | Merge pull request #3973 from pks-t/pks/memleak-fixesPatrick Steinhardt2016-10-282-0/+4
|\ \
| * | tests: fetchhead: fix memory leakPatrick Steinhardt2016-10-271-0/+2
| * | tests: vector: fix memory leakPatrick Steinhardt2016-10-271-0/+2
|/ /
* | Merge pull request #3966 from vivaladav/documentation-fixesCarlos Martín Nieto2016-10-161-1/+1
|\ \ | |/ |/|