summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* filter: close the descriptor in case of errorcmn/coverityCarlos Martín Nieto2015-06-101-2/+3
* object: correct the expected ID size in prefix lookupCarlos Martín Nieto2015-06-101-5/+5
* pack: use git_buf when building the index nameCarlos Martín Nieto2015-06-101-10/+11
* merge: actually increment the counts, not the pointersCarlos Martín Nieto2015-06-101-2/+2
* cache: add a check for a failed allocationCarlos Martín Nieto2015-06-101-0/+1
* Merge pull request #3198 from libgit2/cmn/coverityEdward Thomson2015-06-095-10/+11
|\
| * Initialize a few variablesCarlos Martín Nieto2015-06-093-3/+3
| * ssh: move NULL check to the free functionCarlos Martín Nieto2015-06-091-5/+5
| * remote: some error-handling issues from CoverityCarlos Martín Nieto2015-06-071-2/+3
* | Merge pull request #3165 from ethomson/downcaseCarlos Martín Nieto2015-06-088-24/+75
|\ \
| * | git__tolower: test that some non-ASCII downcasing isn'tEdward Thomson2015-05-291-0/+4
| * | git__tolower: a tolower() that isn't dumbEdward Thomson2015-05-297-24/+33
| * | git__strcasecmp: treat input bytes as unsignedEdward Thomson2015-05-292-2/+40
* | | Merge pull request #3188 from thentenaar/clean-up-after-opensslCarlos Martín Nieto2015-06-081-0/+16
|\ \ \
| * | | global: Ensure we free our SSL context.Tim Hentenaar2015-06-081-0/+16
|/ / /
* | | Merge pull request #3185 from libgit2/cmn/foreach-cancel-looseCarlos Martín Nieto2015-06-072-2/+24
|\ \ \
| * | | path: error out if the callback returns an errorcmn/foreach-cancel-looseCarlos Martín Nieto2015-06-062-2/+24
| | |/ | |/|
* | | Merge pull request #3175 from git-up/build_warningsCarlos Martín Nieto2015-06-078-10/+21
|\ \ \
| * | | Fixed build warnings on Xcode 6.1Pierre-Olivier Latour2015-06-028-10/+21
* | | | Merge pull request #3179 from arielb2/masterCarlos Martín Nieto2015-06-071-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | print_usage functions is defined but not usedAriel O. Barria2015-06-031-0/+2
| |/ /
* | | Merge pull request #3172 from Therzok/patch-2Carlos Martín Nieto2015-06-041-1/+7
|\ \ \ | |/ / |/| |
| * | Change error when running out of ssh agent keysMarius Ungureanu2015-06-021-1/+7
|/ /
* | Include git2/transaction.hCarlos Martín Nieto2015-05-311-0/+1
* | Merge pull request #3152 from tkelman/patch-1Carlos Martín Nieto2015-05-311-0/+1
|\ \
| * | build maint branches on appveyorTony Kelman2015-05-221-0/+1
* | | Merge pull request #3048 from pks-t/insteadofCarlos Martín Nieto2015-05-315-5/+164
|\ \ \
| * | | remote: test insteadOf for anonymous remotesPatrick Steinhardt2015-05-311-0/+12
| * | | Add CHANGELOG entry for url.*.insteadOf feature.Patrick Steinhardt2015-05-311-0/+4
| * | | remote: apply insteadOf configuration.Patrick Steinhardt2015-05-314-5/+148
|/ / /
* | | CHANGELOG: fill in a few missing entriesCarlos Martín Nieto2015-05-291-5/+20
* | | Merge pull request #3157 from mgorny/ssh_memory_authCarlos Martín Nieto2015-05-295-1/+168
|\ \ \
| * | | test: Add a test for in-memory SSH private key cred_cbMichał Górny2015-05-271-0/+68
| * | | cred: Check for null values when getting key from memoryMichał Górny2015-05-271-1/+4
| * | | cred: Declare GIT_CREDTYPE_SSH_MEMORY unconditionallyMichał Górny2015-05-272-4/+0
| * | | cmake: Add CMake check for libssh2 memory credential passing supportMichał Górny2015-05-271-0/+5
| * | | Return an error when ssh memory credentials are not supported.David Calavera2015-05-272-4/+6
| * | | Add support to read ssh keys from memory.David Calavera2015-05-273-1/+94
| |/ /
* | | Merge pull request #3163 from ethomson/emergeconflictCarlos Martín Nieto2015-05-297-18/+21
|\ \ \
| * | | Rename GIT_EMERGECONFLICT to GIT_ECONFLICTEdward Thomson2015-05-297-18/+21
* | | | Merge pull request #3161 from fxfactorial/masterEdward Thomson2015-05-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Changed README to use new OCaml bindings to gitEdgar Aroutiounian2015-05-281-1/+1
|/ / /
* | | Merge pull request #3139 from ethomson/diff_conflictsCarlos Martín Nieto2015-05-2828-177/+675
|\ \ \
| * | | index_add_all: remove conflicts when no wd fileEdward Thomson2015-05-281-1/+2
| * | | Introduce `GIT_DIFF_FLAG_EXISTS`Edward Thomson2015-05-283-1/+12
| * | | git_index_add_all: test that conflicts are handledEdward Thomson2015-05-281-49/+104
| * | | Introduce cl_git_sandbox_init_new()Edward Thomson2015-05-282-0/+9
| * | | diff: prettify `maybe_modified` a littleEdward Thomson2015-05-281-12/+15
| * | | introduce `git_index_entry_is_conflict`Edward Thomson2015-05-289-15/+34
| * | | conflict tests: use GIT_IDXENTRY_STAGE_SETEdward Thomson2015-05-287-26/+26