summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* odb: actually insert the empty blob in testsethomson/empty_blobEdward Thomson2016-08-052-32/+34
|
* odb: only provide the empty treeEdward Thomson2016-08-052-19/+15
| | | | | | | Only provide the empty tree internally, which matches git's behavior. If we provide the empty blob then any users trying to write it with libgit2 would omit it from actually landing in the odb, which appear to git proper as a broken repository (missing that object).
* Merge pull request #3886 from libgit2/cmn/copypeertrust-nullEdward Thomson2016-08-051-0/+3
|\ | | | | SecureTransport: handle NULL trust on success
| * SecureTransport: handle NULL trust on successcmn/copypeertrust-nullCarlos Martín Nieto2016-08-051-0/+3
| | | | | | | | | | | | | | | | | | The `SSLCopyPeerTrust` call can succeed but fail to return a trust object if it can't load the certificate chain and thus cannot check the validity of a certificate. This can lead to us calling `CFRelease` on a `NULL` trust object, causing a crash. Handle this by returning ECERTIFICATE.
* | Merge pull request #3881 from pks-t/pks/fix-clar-suite-prefix-computationCarlos Martín Nieto2016-08-051-0/+6
|\ \ | |/ |/| clar: fix parsing of test suite prefixes
| * clar: fix parsing of test suite prefixesPatrick Steinhardt2016-08-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing in a specific suite which should be executed by clar via `-stest::suite`, we try to parse this string and then include all tests contained in this suite. This also includes all tests in sub-suites, e.g. 'test::suite::foo'. In the case where multiple suites start with the same _string_, for example 'test::foo' and 'test::foobar', we fail to distinguish this correctly. When passing in `-stest::foobar`, we wrongly determine that 'test::foo' is a prefix and try to execute all of its matching functions. But as no function will now match 'test::foobar', we simply execute nothing. To fix this, we instead have to check if the prefix is an actual suite prefix as opposed to a simple string prefix. We do so by by inspecting if the first two characters trailing the prefix are our suite delimiters '::', and only consider the filter as matching in this case.
* | Merge pull request #3884 from pks-t/pks/patch-image-initializationEdward Thomson2016-08-052-1/+6
|\ \ | | | | | | Patch image initialization
| * | apply: fix warning when initializing patch imagesPatrick Steinhardt2016-08-051-1/+1
| | |
| * | pool: provide macro to statically initialize git_poolPatrick Steinhardt2016-08-051-0/+5
|/ /
* | Merge pull request #3861 from libgit2/ethomson/refresh_objectsEdward Thomson2016-08-049-3/+220
|\ \ | | | | | | odb: freshen existing objects when writing
| * | odb: only freshen pack files every 2 secondsethomson/refresh_objectsEdward Thomson2016-08-046-10/+37
| | | | | | | | | | | | | | | | | | Since writing multiple objects may all already exist in a single packfile, avoid freshening that packfile repeatedly in a tight loop. Instead, only freshen pack files every 2 seconds.
| * | odb: freshen existing objects when writingEdward Thomson2016-08-048-3/+193
|/ / | | | | | | | | | | When writing an object, we calculate its OID and see if it exists in the object database. If it does, we need to freshen the file that contains it.
* | Merge pull request #3877 from libgit2/ethomson/paths_initCarlos Martín Nieto2016-08-042-52/+41
|\ \ | | | | | | sysdir: don't assume an empty dir is uninitialized
| * | sysdir: use the standard `init` patternethomson/paths_initEdward Thomson2016-08-042-52/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to determine when sysdirs are uninitialized. Instead, simply initialize them all at `git_libgit2_init` time and never try to reinitialize, except when consumers explicitly call `git_sysdir_set`. Looking at the buffer length is especially problematic, since there may no appropriate path for that value. (For example, the Windows-specific programdata directory has no value on non-Windows machines.) Previously we would continually trying to re-lookup these values, which could get racy if two different threads are each calling `git_sysdir_get` and trying to lookup / clear the value simultaneously.
* | | Merge pull request #3869 from richardipsum/fix-outdated-commentEdward Thomson2016-08-041-3/+3
|\ \ \ | | | | | | | | Fix outdated comment
| * | | Make comment conform to style guideRichard Ipsum2016-07-231-1/+2
| | | | | | | | | | | | | | | | Style guide says // style comments should be avoided.
| * | | Fix outdated commentRichard Ipsum2016-07-231-2/+1
| | | | | | | | | | | | | | | | SSH transport seems to be supported now.
* | | | Merge pull request #3850 from wildart/custom-tlsEdward Thomson2016-08-044-10/+1
|\ \ \ \ | | | | | | | | | | Enable https transport for custom TLS streams
| * | | | remove conditions that prevent use of custom TLS streamwildart2016-07-064-10/+1
| | | | |
* | | | | Merge pull request #3879 from libgit2/ethomson/mwindow_initEdward Thomson2016-08-044-26/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | mwindow: init mwindow files in git_libgit2_init
| * | | | mwindow: init mwindow files in git_libgit2_initethomson/mwindow_initEdward Thomson2016-08-044-26/+12
| | |_|/ | |/| |
* | | | Merge pull request #3880 from libgit2/ethomson/diff_fileEdward Thomson2016-08-033-10/+12
|\ \ \ \ | |/ / / |/| | | git_diff_file: move `id_abbrev`
| * | | git_diff_file: move `id_abbrev`ethomson/diff_fileEdward Thomson2016-08-033-10/+12
|/ / / | | | | | | | | | | | | Move `id_abbrev` to a more reasonable place where it packs more nicely (before anybody starts using it).
* | | Merge pull request #3865 from libgit2/ethomson/leaksEdward Thomson2016-08-0214-354/+407
|\ \ \ | | | | | | | | Fix leaks, some warnings and an error
| * | | crlf: set a safe crlf defaultEdward Thomson2016-07-241-0/+1
| | | |
| * | | repository: don't cast to `int` for no reasonEdward Thomson2016-07-241-4/+4
| | | | | | | | | | | | | | | | | | | | And give it a default so that some compilers don't (unnecessarily) complain.
| * | | index: cast to avoid warningEdward Thomson2016-07-241-2/+2
| | | |
| * | | tests: use a `size_t`Edward Thomson2016-07-242-8/+6
| | | |
| * | | packbuilder: `size_t` all the thingsEdward Thomson2016-07-245-81/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 1cd65991, we were passing a pointer to an `unsigned long` to a function that now expected a pointer to a `size_t`. These types differ on 64-bit Windows, which means that we trash the stack. Use `size_t`s in the packbuilder to avoid this.
| * | | apply: safety check files that dont end with eolEdward Thomson2016-07-241-1/+4
| | | |
| * | | apply: check allocation properlyEdward Thomson2016-07-241-1/+1
| | | |
| * | | apply: compare preimage to imageEdward Thomson2016-07-241-1/+1
| | | | | | | | | | | | | | | | Compare the preimage to the image; don't compare the preimage to itself.
| * | | repo::open: remove dead code, free buffersEdward Thomson2016-07-242-256/+277
| | | |
* | | | Merge pull request #3815 from pks-t/pks/coverity-modelEdward Thomson2016-07-241-0/+75
|\ \ \ \ | | | | | | | | | | Coverity user model
| * | | | coverity: model functions printing into git_bufPatrick Steinhardt2016-06-071-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_buf` structure seems to be too complicated to correctly grasp for Coverity. As such, add simpler models trying to guide Coverity and remove false positives related to these functions.
| * | | | coverity: add user modelPatrick Steinhardt2016-06-071-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static analysis engine coverity allows for user models overriding how it treats functions when analyzing code. Like this, one can greatly reduce the rate of false positives and thus make it easier to spot actual errors. Add a user model that overrides function models for `git_buf_len` and `git_vector_insert`, which together amount for a majority of false positives.
* | | | | Merge pull request #3862 from novalis/dturner/do-not-die-on-missing-configEdward Thomson2016-07-242-4/+13
|\ \ \ \ \ | |_|/ / / |/| | | | remote: Handle missing config values when deleting a remote
| * | | | remote: Handle missing config values when deleting a remoteDavid Turner2016-07-152-4/+13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow I ended up with the following in my ~/.gitconfig: [branch "master"] remote = origin merge = master rebase = true I assume something went crazy while I was running the git.git tests some time ago, and that I never noticed until now. This is not a good configuration, but it shouldn't cause problems. But it does. Specifically, if you have this in your config, and you perform the following set of actions: create a remote fetch from that remote create a branch off of the remote master branch called "master" delete the branch delete the remote The remote delete fails with the message "Could not find key 'branch.master.rebase' to delete". This is because it's iterating over the config entries (including the ones in the global config) and believes that there is a master branch which must therefore have these config keys. https://github.com/libgit2/libgit2/issues/3856
* | | | Merge pull request #3868 from libgit2/ethomson/mac_buildEdward Thomson2016-07-242-0/+6
|\ \ \ \ | |/ / / |/| | | ci: point to the homebrew libssh2 install
| * | | ci: install homebrew's curl on macethomson/mac_buildEdward Thomson2016-07-242-1/+2
| | | |
| * | | ci: install homebrew's zlib on macEdward Thomson2016-07-222-0/+5
|/ / /
* | | Merge pull request #3851 from txdv/get-user-agentEdward Thomson2016-07-054-0/+19
|\ \ \ | | | | | | | | Add get user agent functionality.
| * | | Add get user agent functionality.Andrius Bentkus2016-07-054-0/+19
| | |/ | |/|
* | | Merge pull request #3846 from rkrp/fix_bug_parsing_int64minEdward Thomson2016-07-052-3/+11
|\ \ \ | |/ / |/| | Fixed bug while parsing INT64_MIN
| * | Fixed bug while parsing INT64_MINKrishna Ram Prakash R2016-06-292-3/+11
| | |
* | | Merge pull request #3836 from joshtriplett/cleanup-find_repoEdward Thomson2016-07-011-22/+30
|\ \ \ | | | | | | | | find_repo: Clean up and simplify logic
| * | | find_repo: Clean up and simplify logicJosh Triplett2016-06-241-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_repo had a complex loop and heavily nested conditionals, making it difficult to follow. Simplify this as much as possible: - Separate assignments from conditionals. - Check the complex loop condition in the only place it can change. - Break out of the loop on error, rather than going through the rest of the loop body first. - Handle error cases by immediately breaking, rather than nesting conditionals. - Free repo_link unconditionally on the way out of the function, rather than in multiple places. - Add more comments on the remaining complex steps.
* | | | Merge pull request #3711 from joshtriplett/git_repository_discover_defaultEdward Thomson2016-07-015-20/+520
|\ \ \ \ | | | | | | | | | | Add GIT_REPOSITORY_OPEN_FROM_ENV flag to respect $GIT_* environment vars
| * | | | CHANGELOG.md: Document new flags for git_repository_open_extJosh Triplett2016-06-301-0/+19
| | | | | | | | | | | | | | | | | | | | Document GIT_REPOSITORY_OPEN_NO_DOTGIT and GIT_REPOSITORY_OPEN_FROM_ENV.
| * | | | CHANGELOG.md: Document behavior change in repository discoveryJosh Triplett2016-06-301-0/+7
| |/ / /