summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sysdir: remove unused git_sysdir_get_strethomson/sysdir_unusedEdward Thomson2020-04-052-30/+0
|
* Merge pull request #5425 from lhchavez/fix-get-delta-basePatrick Steinhardt2020-04-043-26/+44
|\ | | | | pack: Improve error handling for get_delta_base()
| * Re-adding the "delta offset is zero" error caselhchavez2020-04-021-0/+6
| |
| * Making get_delta_base() conform to the general error-handling patternlhchavez2020-04-013-25/+29
| | | | | | | | | | This makes get_delta_base() return the error code as the return value and the delta base as an out-parameter.
| * pack: Improve error handling for get_delta_base()lhchavez2020-04-011-7/+15
| | | | | | | | | | | | | | | | This change moves the responsibility of setting the error upon failures of get_delta_base() to get_delta_base() instead of its callers. That way, the caller chan always check if the return value is negative and mark the whole operation as an error instead of using garbage values, which can lead to crashes if the .pack files are malformed.
* | Merge pull request #5480 from libgit2/ethomson/coverityPatrick Steinhardt2020-04-041-2/+2
|\ \ | | | | | | repo::open: ensure we can open the repository
| * | repo::open: ensure we can open the repositoryethomson/coverityEdward Thomson2020-04-031-2/+2
| | | | | | | | | | | | Update the test cases to check the `git_repository_open` return code.
* | | Merge pull request #5421 from petersalomonsen/examples-fixes-and-additionsPatrick Steinhardt2020-04-045-1/+147
|\ \ \ | | | | | | | | examples: additions and fixes
| * | | examples: additions and fixesPeter Salomonsen2020-04-025-1/+147
| | | | | | | | | | | | | | | | | | | | | | | | add example for git commit fix example for git add add example for git push
* | | | Merge pull request #5477 from pks-t/pks/rename-detection-negative-cachesPatrick Steinhardt2020-04-042-7/+97
|\ \ \ \ | |_|/ / |/| | | merge: cache negative cache results for similarity metrics
| * | | merge: cache negative cache results for similarity metricsPatrick Steinhardt2020-04-012-7/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When computing renames, we cache the hash signatures for each of the potentially conflicting entries so that we do not need to repeatedly read the file and can at least halfway efficiently determine whether two files are similar enough to be deemed a rename. In order to make the hash signatures meaningful, we require at least four lines of data to be present, resulting in at least four different hashes that can be compared. Files that are deemed too small are not cached at all and will thus be repeatedly re-hashed, which is usually not a huge issue. The issue with above heuristic is in case a file does _not_ have at least four lines, where a line is anything separated by a consecutive run of "\n" or "\0" characters. For example "a\nb" is two lines, but "a\0\0b" is also just two lines. Taken to the extreme, a file that has megabytes of consecutive space- or NUL-only may also be deemed as too small and thus not get cached. As a result, we will repeatedly load its blob, calculate its hash signature just to finally throw it away as we notice it's not of any value. When you've got a comparitively big file that you compare against a big set of potentially renamed files, then the cost simply expodes. The issue can be trivially fixed by introducing negative cache entries. Whenever we determine that a given blob does not have a meaningful representation via a hash signature, we store this negative cache marker and will from then on not hash it again, but also ignore it as a potential rename target. This should help the "normal" case already where you have a lot of small files as rename candidates, but in the above scenario it's savings are extraordinarily high. To verify we do not hit the issue anymore with described solution, this commit adds a test that uses the exact same setup described above with one 50 megabyte blob of '\0' characters and 1000 other files that get renamed. Without the negative cache: $ time ./libgit2_clar -smerge::trees::renames::cache_recomputation >/dev/null real 11m48.377s user 11m11.576s sys 0m35.187s And with the negative cache: $ time ./libgit2_clar -smerge::trees::renames::cache_recomputation >/dev/null real 0m1.972s user 0m1.851s sys 0m0.118s So this represents a ~350-fold performance improvement, but it obviously depends on how many files you have and how big the blob is. The test number were chosen in a way that one will immediately notice as soon as the bug resurfaces.
* | | | Merge pull request #5388 from bk2204/repo-format-v1Patrick Steinhardt2020-04-022-9/+84
|\ \ \ \ | | | | | | | | | | Handle repository format v1
| * | | | repository: handle format v1brian m. carlson2020-02-112-9/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git has supported repository format version 1 for some time. This format is just like version 0, but it supports extensions. Implementations must reject extensions that they don't support. Add support for this format version and reject any extensions but extensions.noop, which is the only extension we currently support. While we're at it, also clean up an error message.
* | | | | Merge pull request #5440 from pks-t/pks/cmake-streamliningPatrick Steinhardt2020-04-024-91/+66
|\ \ \ \ \ | | | | | | | | | | | | CMake: backend selection streamlining
| * | | | | cmake: streamline backend detectionPatrick Steinhardt2020-04-014-91/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're currently doing unnecessary work to auto-detect backends even if the functionality is disabled altogether. Let's fix this by removing the extraneous FOO_BACKEND variables, instead letting auto-detection modify the variable itself.
* | | | | | Merge pull request #5461 from pks-t/pks/refdb-fs-unused-headerEdward Thomson2020-04-012-21/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | refdb_fs: remove unused header file
| * | | | | refdb_fs: remove unused header filePatrick Steinhardt2020-03-252-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "refdb_fs.h" header contains a single struct `git_refcache` that is not used anywhere. As a result, we can just delete the header altogether as it doesn't have any purpose and may confuse readers.
* | | | | | Merge pull request #5466 from pks-t/pks/patch-modechange-with-renameEdward Thomson2020-04-014-7/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | patch: correctly handle mode changes for renames
| * | | | | | patch: correctly handle mode changes for renamesPatrick Steinhardt2020-03-264-7/+22
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a patch for a renamed file whose mode bits have changed in addition to the rename, then we currently fail to parse the generated patch. Furthermore, when generating a diff we output mode bits after the similarity metric, which is different to how upstream git handles it. Fix both issues by adding another state transition that allows similarity indices after mode changes and by printing mode changes before the similarity index.
* | | | | | Merge pull request #5474 from pks-t/pks/gitignore-cleanupEdward Thomson2020-04-011-30/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | gitignore: clean up patterns from old times
| * | | | | | gitignore: clean up patterns from old timesPatrick Steinhardt2020-03-301-30/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The gitignore file currently has a lot of patterns for files that we shouldn't write anymore since we have migrated to CMake, as everybody is expected to do out-of-source builds anyway. Let's remove them.
* | | | | | Merge pull request #5478 from pks-t/pks/readme-ci-updateEdward Thomson2020-04-011-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | README.md: update build matrix to reflect our latest releases
| * | | | | README.md: update build matrix to reflect our latest releasesPatrick Steinhardt2020-04-011-1/+1
|/ / / / /
* | | | | Merge pull request #5471 from pks-t/pks/v1.0v1.0.0Patrick Steinhardt2020-04-012-4/+55
|\ \ \ \ \ | |_|/ / / |/| | | | Release v1.0
| * | | | version.h: bump version to v1.0.0Patrick Steinhardt2020-03-281-4/+4
| | | | |
| * | | | docs: update changelog for v1.0Patrick Steinhardt2020-03-281-0/+51
|/ / / /
* | | | Merge pull request #5464 from pks-t/pks/refdb-backend-docsPatrick Steinhardt2020-03-261-2/+109
|\ \ \ \ | | | | | | | | | | refdb_backend: improve callback documentation
| * | | | refdb_backend: improve callback documentationPatrick Steinhardt2020-03-261-2/+109
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The callbacks are currently sparsely documented, making it really hard to implement a new backend without taking a look at the existing refdb_fs backend. Add documentation to make this task hopefully easier to achieve.
* | | | Merge pull request #5465 from libgit2/ethomson/cred_deprecationPatrick Steinhardt2020-03-261-0/+7
|\ \ \ \ | | | | | | | | | | credentials: provide backcompat for opaque structs
| * | | | credentials: provide backcompat for opaque structsethomson/cred_deprecationEdward Thomson2020-03-261-0/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | The credential structures are now opaque and defined in `sys/credential.h`. However, we should continue to provide them for backward compatibility, unless `GIT_DEPRECATED_HARD` is set.
* | | | Merge pull request #5445 from lhchavez/fix-5443Edward Thomson2020-03-266-2/+32
|\ \ \ \ | | | | | | | | | | Fix segfault when calling git_blame_buffer()
| * | | | Fix segfault when calling git_blame_buffer()lhchavez2020-03-236-2/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure that the hunk is not null before trying to dereference it. This avoids segfaults, especially when blaming against a modified buffer (i.e. the index). Fixes: #5443
* | | | Merge pull request #5463 from utkarsh2102/spell-fixPatrick Steinhardt2020-03-261-1/+1
|\ \ \ \ | |/ / / |/| | | Fix spelling error
| * | | Fix spelling errorUtkarsh Gupta2020-03-261-1/+1
|/ / / | | | | | | | | | Signed-off-by: Utkarsh Gupta <utkarsh@debian.org>
* | | Merge pull request #5456 from pks-t/pks/refdb-fs-backend-versionEdward Thomson2020-03-231-0/+3
|\ \ \ | | | | | | | | refdb_fs: initialize backend version
| * | | refdb_fs: initialize backend versionPatrick Steinhardt2020-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | While the `git_refdb_backend()` struct has a version, we do not initialize it correctly when calling `git_refdb_backend_fs()`. Fix this by adding the call to `git_refdb_init_backend()`.
* | | | Merge pull request #5444 from josharian/issue5428Edward Thomson2020-03-231-4/+5
|\ \ \ \ | |/ / / |/| | | repository: improve commondir docs
| * | | repository: improve commondir docsJosh Bleecher Snyder2020-03-071-4/+5
| | | | | | | | | | | | | | | | Fixes #5428
* | | | Merge pull request #5455 from pks-t/pks/cmake-install-dirsEdward Thomson2020-03-214-19/+12
|\ \ \ \ | | | | | | | | | | cmake: use install directories provided via GNUInstallDirs
| * | | | cmake: use install directories provided via GNUInstallDirsPatrick Steinhardt2020-03-144-19/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently hand-code logic to configure where to install our artifacts via the `LIB_INSTALL_DIR`, `INCLUDE_INSTALL_DIR` and `BIN_INSTALL_DIR` variables. This is reinventing the wheel, as CMake already provide a way to do that via `CMAKE_INSTALL_<DIR>` paths, e.g. `CMAKE_INSTALL_LIB`. This requires users of libgit2 to know about the discrepancy and will require special hacks for any build systems that handle these variables in an automated way. One such example is Gentoo Linux, which sets up these paths in both the cmake and cmake-utils eclass. So let's stop doing that: the GNUInstallDirs module handles it in a better way for us, especially so as the actual values are dependent on CMAKE_INSTALL_PREFIX. This commit removes our own set of variables and instead refers users to use the standard ones. As a second benefit, this commit also fixes our pkgconfig generation to use the GNUInstallDirs module. We had a bug there where we ignored the CMAKE_INSTALL_PREFIX when configuring the libdir and includedir keys, so if libdir was set to "lib64", then libdir would be an invalid path. With GNUInstallDirs, we can now use `CMAKE_INSTALL_FULL_LIBDIR`, which handles the prefix for us.
* | | | Merge pull request #5451 from pks-t/pks/docker-curlEdward Thomson2020-03-1810-51/+58
|\ \ \ \ | | | | | | | | | | azure: fix errors due to curl and removal of old VM images
| * | | | ci: don't use --insecureEdward Thomson2020-03-172-2/+2
| | | | | | | | | | | | | | | | | | | | mbedTLS has fixed their certificate. 🎉
| * | | | azure: docker: use insecure flag to fix curl downloadsPatrick Steinhardt2020-03-132-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently hve some problems with our curl downloads when building Docker images. It's not quite obvious what the problem is and they seem to occur semi-randomly. To unblock our CI, let's add the "--insecure" flag to curl to ignore any certificate errors. This is intended as a temporary solution only.
| * | | | azure: upgrade to newer hosted VM imagesPatrick Steinhardt2020-03-133-34/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Azure is phasing out old images on March 23rd 2020, but we're currently still using them. So let's upgrade images as following: - Ubuntu 16.04 -> ubuntu-18.04 - macOS 10.13 -> macOS-10.15 - Hosted Windows machines -> vs2017-win2016 Each of them is currently the latest version. As the new Microsoft Windows machine has upgraded to MSVS2017, we need to also adjust our CMake generators to "Visual Studio 15 2017". As this CMake generator doesn't accept the target platform name anymore, we instead need to set it up via either "-A Win32" or "-A x64". [1]: https://devblogs.microsoft.com/devops/removing-older-images-in-azure-pipelines-hosted-pools/
| * | | | azure: docurium: fix build failure due to bumped CMake requirementsPatrick Steinhardt2020-03-131-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our Docurium builds currently depend on Debian Jessie, which has CMake v3.0 available. As rugged has bumped its CMake requirements to need at least v3.5 now, the documentation build is thus failing. Fix this by converting our Docurium Docker image to be based on Ubuntu Bionic. We already do base all of our images on Ubuntu, so I don't see any sense in using Debian here. If this was only to speed up builds, we should just go all the way and use some minimal container like Alpine anyway. Also remove cache busters. As we're rebuilding the image every time, it's we really don't need them at all.
| * | | | azure: docker: consistently silence curl but show errorsPatrick Steinhardt2020-03-134-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently pass the "--silent" flag to most invocations of curl, but in fact this does not only suppress the progress meter, but also any errors. So let's also pass "--show-error", too.
| * | | | ntlmclient: silence deprecation warnings for CommonCrypto backendPatrick Steinhardt2020-03-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The `CC_MD4()` function has been deprecated in macOS 10.15. Silence this warning for now until we implement a proper fix.
| * | | | cmake: ignore deprecation notes for Secure TransportPatrick Steinhardt2020-03-131-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The Secure Transport interface we're currently using has been deprecated with macOS 10.15. As we're currently in code freeze, we cannot migrate to newer interfaces. As such, let's disable deprecation warnings for our "schannel.c" stream.
* | | | Merge pull request #5435 from libgit2/ethomson/canonicalEdward Thomson2020-03-105-14/+105
|\ \ \ \ | |/ / / |/| | | win32: don't canonicalize relative paths
| * | | win32: test relative symlinksethomson/canonicalPatrick Steinhardt2020-03-101-0/+20
| | | | | | | | | | | | | | | | Ensure that we don't canonicalize symlink targets.