summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* refs: make `git_reference_cmp` consider the nameethomson/reference_cmpEdward Thomson2022-07-074-0/+33
| | | | | | | | `git_reference_cmp` only considers the target of a reference, and ignores the name. Meaning that a reference `foo` and reference `bar` pointing to the same commit will compare equal. Correct this, comparing the name _and_ target of a reference.
* Merge pull request #6333 from jpalus/pcre2-detectionEdward Thomson2022-07-072-5/+4
|\ | | | | cmake: drop posix dependency from pcre* detection
| * cmake: drop posix dependency from pcre* detectionJan Palus2022-07-072-5/+4
| | | | | | | | | | since f585b12 neither PCRE nor PCRE2 backends rely on POSIX regex, so reflect it in library detection logic
* | Merge pull request #6334 from i-tengfei/fix-rebase-interactiveEdward Thomson2022-07-071-1/+11
|\ \ | | | | | | fix interactive rebase detect.
| * | rebase: formatting fixesEdward Thomson2022-07-061-3/+4
| | |
| * | fix interactive rebase detect.Tengfei2022-06-281-1/+10
| |/
* | Merge pull request #6335 from kcsaul/fix/config-find-system-fileEdward Thomson2022-07-061-2/+2
|\ \ | | | | | | Fix internal git_sysdir_find* function usage within public git_config_find* functions
| * | config: use correct git_sysdir_find* function within git_config_find* functionsKevin Saul2022-06-281-2/+2
| |/
* | Merge pull request #6340 from vishwin/mainEdward Thomson2022-07-061-1/+3
|\ \ | | | | | | ntlmclient: LibreSSL 3.5 removed HMAC_CTX_cleanup
| * | ntlmclient: LibreSSL 3.5 removed HMAC_CTX_cleanupCharlie Li2022-07-031-1/+3
| |/ | | | | | | | | | | https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt Modify guard to declare dummy function.
* | Merge pull request #6343 from libgit2/ethomson/ciEdward Thomson2022-07-064-12/+16
|\ \ | | | | | | ci: update dockerfiles for mbedTLS new url
| * | ci: update dockerfiles for mbedTLS new urlEdward Thomson2022-07-063-11/+11
| | | | | | | | | | | | Update the new URL for mbedTLS.
| * | actions: pass UID and GID to PR builds of dockerfilesEdward Thomson2022-07-061-1/+5
|/ /
* | Merge pull request #6342 from libgit2/ethomson/actions_limitsEdward Thomson2022-07-063-36/+41
|\ \ | |/ |/| CI: limits actions scheduled workflows to the main repo
| * actions: move CodeQL workflow into nightlyEdward Thomson2022-07-062-40/+29
| |
| * actions: limit secheduled workflows to our main repoEdward Thomson2022-07-063-1/+17
|/ | | | | Only run scheduled workflows on the main repository; prevents people from using build minutes on their forks.
* Merge pull request #6303 from zawata/legacy_buffer_stream_segfaultEdward Thomson2022-06-221-0/+30
|\ | | | | filter: Fix Segfault
| * copy back git_buf after callbackJohn Alden2022-06-221-6/+16
| |
| * fix indentation, copy asizeJohn Alden2022-06-161-7/+9
| |
| * Address feedbackJohn Alden2022-06-141-3/+11
| | | | | | Co-authored-by: Edward Thomson <ethomson@github.com>
| * Call legacy_write_fn if givenJohn Alden2022-05-131-0/+10
| |
* | Merge pull request #6321 from libgit2/ethomson/ownershipEdward Thomson2022-06-132-3/+4
|\ \ | | | | | | repo: allow administrator to own the configuration
| * | repo: allow administrator to own the configurationEdward Thomson2022-06-132-3/+4
| | | | | | | | | | | | | | | | | | | | | Update our ownership checks that were introduced in libgit2 v1.4.3 (to combat CVE 2022-24765). These were not compatible with git's; git itself allows administrators to own the path. Our checks now match this behavior.
* | | Merge pull request #6322 from libgit2/ethomson/statEdward Thomson2022-06-131-2/+5
|\ \ \ | | | | | | | | status: update documentation for default options
| * | | status: update documentation for default optionsEdward Thomson2022-06-131-2/+5
|/ / /
* | | Merge pull request #6320 from libgit2/ethomson/config-docsEdward Thomson2022-06-131-2/+2
|\ \ \ | |/ / |/| | config: update config entry iteration lifecycle
| * | config: update config entry iteration lifecycleEdward Thomson2022-06-131-2/+2
|/ /
* | cmake: only use `getloadavg` where it existsEdward Thomson2022-06-133-2/+8
| |
* | cmake: add `gnu` library for HaikuEdward Thomson2022-06-131-2/+2
| |
* | cmake: detect `getentropy`Edward Thomson2022-06-131-0/+4
| | | | | | | | Look for `getentropy` and flag its existence.
* | Merge pull request #6278 from ↵Edward Thomson2022-06-125-3/+188
|\ \ | | | | | | | | | | | | lhchavez/git_transport_smart_remote_connect_options transport: introduce `git_transport_smart_remote_connect_options`
| * | transport: remove `git_transport_smart_proxy_options` Edward Thomson2022-06-121-10/+0
| | | | | | | | | Snuck in during refactoring; let's get rid of it.
| * | Merge remote-tracking branch 'origin/main' into mainlhchavez2022-06-1146-153/+982
| |\ \
| * | | Apply suggestions from code reviewlhchavez2022-06-114-3/+5
| | | | | | | | | | | | Co-authored-by: Edward Thomson <ethomson@github.com>
| * | | transport: introduce `git_transport_smart_remote_connect_options`lhchavez2022-04-165-3/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fc6eeb66c40310086c8f059cae41de69ad4c6da removed `git_transport_smart_proxy_option`, and there was nothing added to replace it. That made it hard for custom transports / smart subtransports to know what remote connect options to use (e.g. proxy options). This change introduces `git_transport_smart_remote_connect_options` to replace it.
* | | | Merge pull request #6288 from libgit2/cmn/mwindow-simplificationsEdward Thomson2022-06-122-10/+10
|\ \ \ \ | | | | | | | | | | A couple of simplications around mwindow
| * | | | mwindow: use multiplication instesad of conditionalsCarlos Martín Nieto2022-04-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a very verbose way of performing a comparison where we already have the identity value with both signs. Instead of chainging several conditions, we can rely on the maths working out.
| * | | | mwindow: include both the offset and the extra in the same callCarlos Martín Nieto2022-04-292-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | This makes it a bit easier to read while letting the caller specify how big the hash size is for this particular call.
* | | | | Merge pull request #6023 from libgit2/ethomson/clang-formatEdward Thomson2022-06-111-0/+92
|\ \ \ \ \ | |_|_|/ / |/| | | | Add a .clang-format with our style
| * | | | Add a .clang-format with our styleethomson/clang-formatEdward Thomson2021-08-301-0/+92
| | | | |
* | | | | Merge pull request #6319 from libgit2/ethomson/progress_32bitEdward Thomson2022-06-112-5/+24
|\ \ \ \ \ | | | | | | | | | | | | CLI: progress updates
| * | | | | progress: fewer updates about throughputEdward Thomson2022-06-112-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid too much flashing on the console with updates about throughput. Only update throughput once a second.
| * | | | | cli: show progress on 32 bit machinesEdward Thomson2022-06-111-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #6305 from zawata/fix_refdb_error_msgEdward Thomson2022-06-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | refs: fix missing error message
| * | | | | fix missing error messageJohn Alden2022-05-171-1/+1
| |/ / / /
* | | | | Merge pull request #6287 from SkinnyMind/docs-typosEdward Thomson2022-06-113-7/+7
|\ \ \ \ \ | | | | | | | | | | | | docs: fix couple of typos
| * | | | | docs: fix couple of typosAleksey Kulikov2022-04-283-7/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #6299 from dongcarl/patch-1Edward Thomson2022-06-111-2/+0
|\ \ \ \ \ | | | | | | | | | | | | revparse: Remove error-prone, redundant test
| * | | | | revparse: Remove error-prone, redundant testCarl Dong2022-05-091-2/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally introduced in: 776a6a8e5f8e258d31aded73c0ce38df6ac7bdc4 This test case has recently been fixed in bdab22384cc61d315005a65456a9f9563bb27c8f, but that fix will only last for a year. Next year the same problem will crop up and the test will need to be re-edited. This is not ideal as - This test case becomes an unnecessary burden for developers - Downstream distros or even just users who want to build older versions of libgit2 are guaranteed to have this test fail Furthermore, this test case is entirely unnecessary, as the functionality that was originally (see 776a6a8e5f8e258d31aded73c0ce38df6ac7bdc4) intended to be tested is well-covered by subsequent tests which specify a date instead of a "x ago" specification.
* | | | | Merge pull request #6291 from libgit2/cmn/midx-no-hashEdward Thomson2022-06-111-6/+0
|\ \ \ \ \ | | | | | | | | | | | | midx: do not verify the checksum on load
View Lorry Controller Status