summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3215 from jeffhostetler/windows_leak_diriterCarlos Martín Nieto2015-06-121-0/+2
|\
| * Fix memory leak on windows in diriter.Jeff Hostetler2015-06-121-0/+2
* | Fixed some Secure Transport issues on OS XPierre-Olivier Latour2015-06-111-20/+36
* | Merge pull request #3205 from ethomson/crlf_queryCarlos Martín Nieto2015-06-111-1/+23
|\ \
| * | Introduce `git_filter_list_contains`Edward Thomson2015-06-101-1/+23
* | | Merge pull request #3174 from libgit2/cmn/idx-fill-holeEdward Thomson2015-06-101-3/+4
|\ \ \
| * | | indexer: use lseek to extend the packfilecmn/idx-fill-holeCarlos Martín Nieto2015-06-021-3/+4
* | | | Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()Pierre-Olivier Latour2015-06-101-4/+4
| |/ / |/| |
* | | 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-087-24/+33
|\ \ \
| * | | git__tolower: a tolower() that isn't dumbEdward Thomson2015-05-297-24/+33
| * | | git__strcasecmp: treat input bytes as unsignedEdward Thomson2015-05-291-2/+2
* | | | 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-071-2/+4
|\ \ \ \
| * | | | path: error out if the callback returns an errorcmn/foreach-cancel-looseCarlos Martín Nieto2015-06-061-2/+4
| | |/ / | |/| |
* | | | Merge pull request #3175 from git-up/build_warningsCarlos Martín Nieto2015-06-072-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed build warnings on Xcode 6.1Pierre-Olivier Latour2015-06-022-1/+7
| | |/ | |/|
* | | Change error when running out of ssh agent keysMarius Ungureanu2015-06-021-1/+7
|/ /
* | remote: apply insteadOf configuration.Patrick Steinhardt2015-05-311-5/+70
* | Merge pull request #3157 from mgorny/ssh_memory_authCarlos Martín Nieto2015-05-292-1/+71
|\ \
| * | 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-271-2/+0
| * | Return an error when ssh memory credentials are not supported.David Calavera2015-05-271-2/+6
| * | Add support to read ssh keys from memory.David Calavera2015-05-272-1/+66
* | | Rename GIT_EMERGECONFLICT to GIT_ECONFLICTEdward Thomson2015-05-293-5/+5
* | | Merge pull request #3139 from ethomson/diff_conflictsCarlos Martín Nieto2015-05-287-86/+258
|\ \ \
| * | | index_add_all: remove conflicts when no wd fileEdward Thomson2015-05-281-1/+2
| * | | Introduce `GIT_DIFF_FLAG_EXISTS`Edward Thomson2015-05-281-1/+6
| * | | diff: prettify `maybe_modified` a littleEdward Thomson2015-05-281-12/+15
| * | | introduce `git_index_entry_is_conflict`Edward Thomson2015-05-284-11/+17
| * | | diff conflicts: don't include incorrect IDEdward Thomson2015-05-281-16/+21
| * | | diff: for conflicts w/o workdir, blank nitem sideEdward Thomson2015-05-281-13/+26
| * | | diff/status: introduce conflictsEdward Thomson2015-05-283-13/+71
| * | | index: validate mode of new conflictsEdward Thomson2015-05-281-0/+9
| * | | index: remove error message in non-error removeEdward Thomson2015-05-281-0/+3
| * | | conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-281-1/+16
| * | | diff: wrap the iterator functionsEdward Thomson2015-05-281-25/+73
| * | | index iterator: optionally include conflictsEdward Thomson2015-05-282-7/+13
| | |/ | |/|
* | | Merge pull request #3149 from libgit2/cmn/upstream-matching-pushEdward Thomson2015-05-282-3/+12
|\ \ \
| * | | branch: error out if we cannot find the remotecmn/upstream-matching-pushCarlos Martín Nieto2015-05-221-3/+6
| * | | refspec: make sure matching refspecs have src, dst and input stringsCarlos Martín Nieto2015-05-221-0/+6
* | | | Merge pull request #3127 from libgit2/cmn/remote-fixupsCarlos Martín Nieto2015-05-281-33/+49
|\ \ \ \ | |_|/ / |/| | |