summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixupethomson/libssh2Edward Thomson2023-01-231-1/+0
|
* fixupEdward Thomson2023-01-231-1/+1
|
* fixupEdward Thomson2023-01-231-2/+2
|
* ci: compile against libssh2 on windowsEdward Thomson2023-01-232-2/+33
|
* ci: use latest ci-dependencies release for mingwEdward Thomson2023-01-231-2/+2
|
* ci: isolate the home directory for test executionEdward Thomson2023-01-231-1/+3
| | | | | | | libgit2 can now isolate its home directory, and our test runner (by default) isolates the home directory. In our CI environment, we want to set up some pieces (like ssh configuration) in a fake homedir. Continue to do so and propagate that to clar.
* tests: use a dummy homedirEdward Thomson2023-01-233-0/+20
| | | | | Use a dummy home directory for tests to avoid user data leaking into test execution.
* tests: configure temporary homedirs correctlyEdward Thomson2023-01-237-36/+98
| | | | | | Now that we've split the notion of the home directory from the global configuration store, our tests should use the appropriate one based on what they're doing.
* core: allow users to configure home directoryEdward Thomson2023-01-232-1/+32
| | | | | | | | | | Some callers -- like our test suite and the test suites of our language bindings -- want to isolate the home directory to avoid accidentally including the executing user's actual home directory data. Previously, we combined the notion of a home directory and global configuration -- now that this is separated, we provide users the ability to configure both.
* config: use home directory for `~` includesEdward Thomson2023-01-232-3/+3
| | | | | | | | Users can specify a config file to be included in the home directory using `~/filename` syntax. Instead of looking in the global configuration location (which may be overridden), use the user's _actual_ home directory. This allows callers to change the global configuration location separately from the home directory.
* attr: use home directory for `~` includesEdward Thomson2023-01-231-1/+1
| | | | | | | | Users can specify an attribute file to be included in the home directory using `~/filename` syntax. Instead of looking in the global configuration location (which may be overridden), use the user's _actual_ home directory. This allows callers to change the global configuration location separately from the home directory.
* ssh: support windows `known_hosts` filesEdward Thomson2023-01-231-7/+7
| | | | | | | Use `git_sysdir_find_homedir_file` to identify the path to the home directory's `.ssh/known_hosts`; this takes Windows paths into account by preferring `HOME`, then falling back to `HOMEPATH` and `USERPROFILE` directories.
* sysdir: provide actual home directoryEdward Thomson2023-01-232-10/+58
| | | | | | | | | | Provide a mechanism to look up the user's home directory, using the same mechanism that we use for locating the global configuration path (a fancy name for saying "the home directory"). SSH known hosts lookups now use this, instead of simply looking at the HOME environment variable, to support Windows-style home directory lookups in `HOME`, `HOMEPATH`, or `USERPROFILE`.
* sysdir: move windows sysdir functions out of shared utilEdward Thomson2023-01-226-318/+275
| | | | | | The windows sysdir functions are libgit2-specific and for git compatibility only; remove them from the shared util directory and bring them into the libgit2 source tree.
* 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.
| * | | tests: append the github.com ssh keys so we have access during testsCarlos Martín Nieto2022-11-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently just the one test needs it. The ssh-rsa makes sure we're asking for the cipher we find in `known_hosts` as that won't be the one selected by default. This will be relevant in later changes.
| * | | ssh: verify the remote's host key against known_hosts if it existsCarlos Martín Nieto2022-11-021-87/+222
| | | | | | | | | | | | | | | | | | | | It turns out this has been available in libssh2 for a long time and we should have been verifying this the whole time.
* | | | README: show v1.5 and v1.4 branch buildsEdward Thomson2023-01-201-1/+1
| | | |
* | | | Merge pull request #6434 from tagesuhu/mainEdward Thomson2022-11-282-1/+25
|\ \ \ \ | |_|/ / |/| | | Fixes #6433: git_submodule_update fails to update configured but missing submodule
| * | | submodule: Do not try to update a missing submoduletagesuhu2022-11-251-1/+5
| | | | | | | | | | | | | | | | | | | | If a submodule has been configured but not yet added, do not try to update it. Issue #6433: git_submodule_update fails to update configured but missing submodule
| * | | tests: Add new test to submodule::updatetagesuhu2022-11-251-0/+20
|/ / / | | | | | | | | | | | | Verify that trying to update submodule which has been configured but not added does return an error. Issue #6433: git_submodule_update fails to update configured but missing submodule
* | | Merge pull request #6326 from libgit2/ethomson/url_parseEdward Thomson2022-11-238-174/+652
|\ \ \ | | | | | | | | URL parsing for google-compatible URLs
| * | | url: only allow @s in usernames for ssh urlsEdward Thomson2022-06-172-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Enforce the RFC for other protocols; Google's questionable choices about malformed SSH protocols shouldn't impact our ability to properly parse HTTPS.
| * | | url_parse: introduce our own url parsingEdward Thomson2022-06-173-84/+542
| | | | | | | | | | | | | | | | | | | | Provide our own url parser, so that we can handle Google Code's "fun" URLs that have a userinfo with an `@` in it. :cry:
| * | | url: test that we don't expand % encoding in pathsEdward Thomson2022-06-171-0/+12
| | | |
| * | | url: remove invalid scp url parsing testEdward Thomson2022-06-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The url::scp::invalid_addresses test attempts to test an invalid IPv6 address. It does not, it calls the regular URL parsing function which treats it like a possibly invalid scheme.
| * | | net: move url tests into utilEdward Thomson2022-06-166-86/+86
| | | |
* | | | Merge pull request #6429 from csware/safe.directory-wildcardEdward Thomson2022-11-232-1/+79
|\ \ \ \ | | | | | | | | | | Add support for "safe.directory *"
| * | | | Add support for "safe.directory *"Sven Strickroth2022-11-192-1/+79
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Merge pull request #6413 from martinvonz/bsd-2-clauseEdward Thomson2022-11-231-0/+30
|\ \ \ \ \ | | | | | | | | | | | | add 2-clause BSD license to COPYING
| * | | | | add 2-clause BSD license to COPYINGMartin von Zweigbergk2022-10-071-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_fs_path_basename_r()` function in `src/util/fs_path.c` says it's based on Android code using the 2-clause BSD license, so I suppose that means the COPYING file should include that.
* | | | | | Merge pull request #6416 from slackner/httpclient_update_optionsEdward Thomson2022-11-233-7/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | http: Update httpclient options when reusing an existing connection.
| * | | | | http: Update httpclient options when reusing an existing connection.Sebastian Lackner2022-10-203-7/+27
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Httpclient internally stores a copy of the certificate_check callback and payload. When connecting via HTTPS, and if the server sends back "Connection: close" after the first request, the following request would attempt to re-use the httpclient and call the (now outdated) callback. In particular for pygit2 this is a problem, since callbacks / payloads are only valid for the duration of a libgit2 call, leading to a ffi.from_handle() error and crashing the Python interpreter.
* | | | | Merge pull request #6421 from ↵Edward Thomson2022-11-181-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | julianmesa-gitkraken/fix-leak-git_tag_create_from_buffer Fix leak in git_tag_create_from_buffer
| * | | | | Missing dispose in git_tag_create__internalJulian Mesa2022-11-031-1/+3
| | | | | |
| * | | | | Missing disposeJulian Mesa2022-11-031-1/+3
| | | | | |
| * | | | | Fix leak in git_tag_create_from_bufferJulian Mesa2022-11-031-0/+1
| |/ / / / | | | | | | | | | | | | | | | If the tag already exists and we are not forcing overwrite we need to free ref_name buffer before return the "tag already exists" error.
* | | | | Merge pull request #6408 from kcsaul/fix-safe-directory-not-foundEdward Thomson2022-11-182-8/+11
|\ \ \ \ \ | | | | | | | | | | | | Ignore missing 'safe.directory' config during ownership checks