summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Teach `git_patch_from_diff` about parsed diffsethomson/patch_from_diffEdward Thomson2016-08-2410-7/+95
| | | | | Ensure that `git_patch_from_diff` can return the patch for parsed diffs, not just generate a patch for a generated diff.
* Merge pull request #3904 from stinb/filesystem-iterator-double-freePatrick Steinhardt2016-08-241-5/+3
|\ | | | | filesystem_iterator: fixed double free on error
| * filesystem_iterator: fixed double free on errorJason Haslam2016-08-221-5/+3
|/
* Merge pull request #3837 from novalis/dturner/indexv4Edward Thomson2016-08-178-29/+289
|\ | | | | Support index v4
| * index: support index v4David Turner2016-08-105-29/+191
| | | | | | | | | | | | | | Support reading and writing index v4. Index v4 uses a very simple compression scheme for pathnames, but is otherwise similar to index v3. Signed-off-by: David Turner <dturner@twitter.com>
| * varint: Add varint encoding/decodingDavid Turner2016-08-103-0/+98
| | | | | | | | | | | | | | This code is ported from git.git Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: David Turner <dturner@twopensource.com>
* | Merge pull request #3895 from pks-t/pks/negate-basename-in-subdirsEdward Thomson2016-08-172-16/+83
|\ \ | |/ |/| ignore: allow unignoring basenames in subdirectories
| * ignore: allow unignoring basenames in subdirectoriesPatrick Steinhardt2016-08-122-16/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .gitignore file allows for patterns which unignore previous ignore patterns. When unignoring a previous pattern, there are basically three cases how this is matched when no globbing is used: 1. when a previous file has been ignored, it can be unignored by using its exact name, e.g. foo/bar !foo/bar 2. when a file in a subdirectory has been ignored, it can be unignored by using its basename, e.g. foo/bar !bar 3. when all files with a basename are ignored, a specific file can be unignored again by specifying its path in a subdirectory, e.g. bar !foo/bar The first problem in libgit2 is that we did not correctly treat the second case. While we verified that the negative pattern matches the tail of the positive one, we did not verify if it only matches the basename of the positive pattern. So e.g. we would have also negated a pattern like foo/fruz_bar !bar Furthermore, we did not check for the third case, where a basename is being unignored in a certain subdirectory again. Both issues are fixed with this commit.
* | Merge pull request #3891 from ↵Carlos Martín Nieto2016-08-091-1/+3
|\ \ | | | | | | | | | | | | pks-t/pks/stransport-memory-management-improvements stransport memory management improvements
| * | stransport: do not use `git_stream_free` on uninitialized stransportPatrick Steinhardt2016-08-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When failing to initialize a new stransport stream, we try to release already allocated memory by calling out to `git_stream_free`, which in turn called out to the stream's `free` function pointer. As we only initialize the function pointer later on, this leads to a `NULL` pointer exception. Furthermore, plug another memory leak when failing to create the SSL context.
* | | Merge pull request #3893 from pks-t/pks/remove-unused-test-cbEdward Thomson2016-08-091-16/+0
|\ \ \ | |/ / |/| | tests: blob: remove unused callback function
| * | tests: blob: remove unused callback functionPatrick Steinhardt2016-08-091-16/+0
| |/
* | Merge pull request #3887 from libgit2/ethomson/empty_blobCarlos Martín Nieto2016-08-084-51/+49
|\ \ | | | | | | odb: only provide the empty tree
| * | 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 #3890 from pks-t/pks/stransport-static-linkageEdward Thomson2016-08-081-8/+8
|\ \ \ | | | | | | | | stransport: make internal functions static
| * | | stransport: make internal functions staticPatrick Steinhardt2016-08-081-8/+8
| | | |
* | | | Merge pull request #3888 from libgit2/ethomson/doc_diff_from_bufferCarlos Martín Nieto2016-08-082-0/+22
|\ \ \ \ | |_|/ / |/| | | diff: document `git_diff_from_buffer`
| * | | diff: document `git_diff_from_buffer`ethomson/doc_diff_from_bufferEdward Thomson2016-08-052-0/+22
|/ / /
* | | 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
| | | |