summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* threadstate: don't use an unnecessary macroethomson/tlsdata_failEdward Thomson2023-02-143-11/+9
| | | | | Now that we've reduced the usage of GIT_THREADSTATE, remove it entirely in favor of git_threadstate_get().
* oid: don't assume thread local state was initializedEdward Thomson2023-02-145-13/+45
| | | | | | git_oid_tostr_s could fail if thread-local state initialization fails. In that case, it will now return `NULL`. Callers should check for `NULL` and propagate the failure.
* errors: don't rely on tls data workingEdward Thomson2023-02-141-14/+69
| | | | | | Thread-local storage data may fail to initialize; in this case, do not try to set the error message into it. When the thread state has not been initialized, return a hardcoded message to that affect.
* errors: drop unneccessary g_git prefixEdward Thomson2023-02-141-6/+6
|
* Merge pull request #6376 from bzEq/bzEq/aix-int64Edward Thomson2023-02-141-0/+2
|\ | | | | Define correct off64_t for AIX
| * Revert "Include <stdint.h>"Kai Luo2022-09-221-1/+2
| | | | | | | | This reverts commit 1fde70bb607c7ba471db359f045affd1f5625e5d.
| * Include <stdint.h>Kai Luo2022-09-221-2/+1
| |
| * On AIX, `off64_t` is equivalent to `long long`.Kai Luo2022-08-091-0/+2
| | | | | | | | See `/usr/include/sys/types.h` on AIX.
* | Merge pull request #6423 from cavaquinho/fix/6422-revwalk_push_glob-dangling-refEdward Thomson2023-02-142-1/+22
|\ \ | | | | | | #6422: handle dangling symbolic refs gracefully
| * | #6422: handle dangling symbolic refs gracefullyMiguel Arroz2022-11-032-1/+22
| | |
* | | Merge branch 'revparse'Edward Thomson2023-02-142-1/+13
|\ \ \
| * | | revparse: comment reflog HEAD@{n} parsingEdward Thomson2023-02-141-5/+10
| | | |
| * | | Fix parsing rev with reflog of HEAD (e.g., HEAD@{3})Sven Strickroth2023-02-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes issue #6156. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | Merge pull request #6374 from vicr123/embed-sshEdward Thomson2023-02-142-11/+4
|\ \ \ \ | | | | | | | | | | Fix build failure with -DEMBED_SSH_PATH
| * | | | Fix EMBED_SSH_PATHVictor Tran2022-08-082-11/+4
| | |_|/ | |/| |
* | | | Merge pull request #6475 from jorio/fix_diff_empty_untracked_fileEdward Thomson2023-02-142-0/+43
|\ \ \ \ | | | | | | | | | | diff_file: Fix crash when freeing a patch representing an empty untracked file
| * | | | diff_file: don't mmap/readbuffer empty filesIliyas Jorio2023-02-132-0/+43
| | |/ / | |/| | | | | | | | | | This prevents GIT_MMAP_VALIDATE from failing. This also prevents git_diff_file_content__unload from attempting to free git_str__initstr.
* | | | Merge pull request #6471 from libgit2/ethomson/openssl3Edward Thomson2023-02-143-7/+12
|\ \ \ \ | | | | | | | | | | Support OpenSSL 3 in dynamic loading mode
| * | | | openssl: support OpenSSL 3 in dynamic modeEdward Thomson2023-02-102-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to load OpenSSL 3 libraries when compiled with OpenSSL-Dynamic support. Handle the deprecated symbol renaming of SSL_get_peer_certificate to SSL_get1_peer_certificate -- try to load the old name and if it fails, use the new one.
| * | | | openssl: retry initialization on failureEdward Thomson2023-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we fail to initialize the OpenSSL subsystem, don't assume that we're "initialized". Subsequent initialization requests -- if there are any -- should replay initialization and fail again.
* | | | | Merge pull request #6473 from RogerGee/new-php-language-bindingsEdward Thomson2023-02-141-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Add new PHP bindings project to language bindings section of README.md
| * | | | chore(docs): update php language binding project linksRoger Gee2023-02-131-1/+1
|/ / / / | | | | | | | | | | | | | | | | Updates the README.md language binding section to reference a new project providing PHP bindings at https://github.com/RogerGee/php-git2.
* | | | Merge pull request #6464 from libgit2/ethomson/openssl3Edward Thomson2023-02-032-0/+4
|\ \ \ \ | |/ / / | | | | Support OpenSSL3: add OpenSSL deprection warning compatibility flag
| * | | Add OpenSSL deprection warningEdward Thomson2023-02-022-0/+4
|/ / / | | | | | | | | | | | | Add `OPENSSL_API_COMPAT=0x10100000L` since we use the now-deprecated low-level hash functions.
* | | Merge pull request #6444 from abizjak/mainEdward Thomson2023-01-261-1/+1
|\ \ \
| * | | Use `git_clone__submodule` to avoid file checks in workdirAleš Bizjak2023-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `git_clone` checks for existence of (non-empty) directories that would clash with what is about to be cloned. This is problematic when cloning submodules since they make sense in the context of a parent module, so they should not use the current working dir. Since in `git_submodule_update` we clone the submodule only when it is not yet initialized we do not need to perform directory checks.
* | | | Merge pull request #6460 from libgit2/ethomson/clar_updateEdward Thomson2023-01-251-2/+3
|\ \ \ \ | | | | | | | | | | ci: always create test summaries, even on failure
| * | | | ci: upgrade test-summary actionEdward Thomson2023-01-251-1/+1
| | | | |
| * | | | ci: update upload-artifact dependencyEdward Thomson2023-01-251-1/+1
| | | | |
| * | | | ci: always create test summaries, even on failureEdward Thomson2023-01-251-0/+1
|/ / / / | | | | | | | | | | | | | | | | When the dependent jobs fail -- possibly due to test failures -- we should still produce the job summary that shows those test failures.
* | | | Merge pull request #6459 from libgit2/ethomson/clar_updateEdward Thomson2023-01-254-37/+109
|\ \ \ \ | | | | | | | | | | tests: update clar test runner
| * | | | clar: cross-platform elapsed time counterEdward Thomson2023-01-251-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Abstract time counter for tests; use gettimeofday on Unix and GetTickCount on Windows.
| * | | | tests: fix clar declarationsEdward Thomson2023-01-251-6/+6
| | | | |
| * | | | tests: update clar test runnerEdward Thomson2023-01-254-42/+86
|/ / / / | | | | | | | | | | | | | | | | Update to the latest main version of clar, which includes improved xml summary output.
* | | | Merge pull request #6458 from 0-wiz-0/netbsdEdward Thomson2023-01-241-112/+0
|\ \ \ \ | | | | | | | | | | src: hide unused hmac() prototype
| * | | | hash: drop all declarations from hmacEdward Thomson2023-01-241-114/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The builtin hash uses the code verbatim from rfc6234, including prototypes for functions that we don't use (like hmac). Remove all unused prototypes to avoid collisions with things that an operating system might provide (like hmac).
| * | | | src: hide unused hmac() prototypeThomas Klausner2023-01-241-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | It conflicts with NetBSD's in its libc. Closes #6457
* | | | Merge pull request #6452 from libgit2/ethomson/oid_warningEdward Thomson2023-01-201-1/+1
|\ \ \ \ | | | | | | | | | | push: use resolved oid as the source
| * | | | push: use resolved oid as the sourceEdward Thomson2023-01-201-1/+1
|/ / / / | | | | | | | | | | | | | | | | 211c97195e2ebcf68e27782715eb756823ad5a91 attempts to use the parsed OID but inverted the arguments to `git_oid_cpy`.
* | | | Merge pull request #6362 from sven-of-cord/mainEdward Thomson2023-01-202-8/+30
|\ \ \ \ | | | | | | | | | | push: revparse refspec source, so you can push things that are not refs
| * | | | push: revparse refspec source, so you can push things that are not refsSven Over2022-07-202-8/+30
| | |/ / | |/| | | | | | | | | | I want to push a commit by OID to a remote branch. Currently, push parses the refspecs such that the source must be the name of a ref (it uses git_reference_name_to_id to resolve it). This commit changes it so push uses git_revparse_single to resolve the source of the refspec. This allows for OIDs or other revs (e.g. `HEAD~2`) to be pushed.
* | | | Merge pull request #6432 from libgit2/ethomson/noop_argsEdward Thomson2023-01-202-19/+21
|\ \ \ \ | | | | | | | | | | thread: avoid warnings when building without threads
| * | | | thread: avoid warnings when building without threadsEdward Thomson2022-11-232-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `git__noop` takes no arguments, so a simple `#define func(a) git__noop` will produce warnings about the unused `a`. Introduce `git__noop_args` to swallow arguments and avoid that warning.
* | | | | Merge pull request #6435 from russell/capabilities-typoEdward Thomson2023-01-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | transport: fix capabilities calculation
| * | | | | transport: fix capabilities calculationRussell Sim2022-11-251-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looks like a typo to me, from what i can see these lines were added at the same time and because of how capabilities are calculated, it's likely that this code will work in situations where these capabilities were the last ones.
* | | | | Merge pull request #6448 from libgit2/ethomson/action_versionsEdward Thomson2023-01-203-9/+9
|\ \ \ \ \ | | | | | | | | | | | | ci: update version numbers of actions
| * | | | | ci: update version numbers of actionsEdward Thomson2023-01-203-9/+9
| | | | | |
* | | | | | Merge commit 'e33d7c068' into ssh_key_checkingEdward Thomson2023-01-203-93/+333
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ssh: look for a key in known_hosts to set the key type for the handshakeCarlos Martín Nieto2022-11-041-53/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server and client negotiate a single hostkey, but the "best" cipher may not be the one for which we have an entry in `known_hosts`. This can lead to us not finding the key in known_hosts even though we should be connecting. Instead here we look up the hostname with a nonsense key to perform a lookup in the known hosts and set that. This is roughly what the OpenSSH client does as well.
| * | | | | tests: move online::clone::ssh_auth_methods into the ssh test suiteCarlos Martín Nieto2022-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're currently running it as part of the online suite but that doesn't have any setup for ssh so we won't find the GitHub keys we set up during the test. It doesn't need the private key setup as we just want to make sure we see some auth request from the server, but with the addition of hostkey checking we're now seeing it fail when we skip these tests.
View Lorry Controller Status