14875 Commits

Author SHA1 Message Date
Edward Thomson
25ec37379e v1.6.2: update changelog v1.6.2 2023-02-28 10:22:07 +00:00
Edward Thomson
9d1a3ef7c7 v1.6.2: update version numbers 2023-02-28 10:18:00 +00:00
Edward Thomson
da82fb5471 Merge pull request #6514 from libgit2/ethomson/libgit2_pc 2023-02-27 15:16:55 -08:00
Edward Thomson
a7561e0eda Merge pull request #6512 from libgit2/ethomson/odb_loose 2023-02-27 14:23:35 -08:00
Edward Thomson
c0dc97be95 Merge pull request #6511 from libgit2/ethomson/hostandport
Revert #6503
2023-02-27 14:11:44 -08:00
Edward Thomson
3142fdba32 meta: configure pkg-config .pc correctly
The library name is correctly libgit2 (not git2) or libgit2-experimental
depending on configuration.
2023-02-27 22:08:47 +00:00
Edward Thomson
59bb933c17 odb: test git_odb_backend_loose 2023-02-27 21:54:59 +00:00
Edward Thomson
c4523c6c66 odb: add back git_odb_backend_loose
`git_odb_backend_loose` was erroneously removed during a refactoring;
add it back.
2023-02-27 21:54:59 +00:00
Edward Thomson
c28ebdf256 Revert "tests: validate host and port for ssh tests when non-standard"
This reverts commit 43e84e246c.
2023-02-27 20:38:02 +00:00
Edward Thomson
5adde38315 Revert "Pass hostkey & port to host verify callback"
This reverts commit f68b40c0af.
2023-02-27 20:37:50 +00:00
Edward Thomson
44d3372e40 Merge pull request #6506 from libgit2/ethomson/zero_update_tips
remote: always populate old id in update tips
2023-02-27 12:32:09 -08:00
Edward Thomson
cd40b91863 remote: always populate old id in update tips
In b1e83cca1b we erroneously stopped
setting the old ID to zero; correct that.
2023-02-25 23:22:32 +00:00
Edward Thomson
8a871d13b7 v1.6.1: correct missing version number updates v1.6.1 2023-02-25 13:53:43 +00:00
Edward Thomson
f507938dbb Merge pull request #6501 from libgit2/ethomson/v1.6
v1.6
2023-02-25 05:47:13 -08:00
Edward Thomson
ef235a1662 v1.6: update version numbers 2023-02-24 22:21:41 +00:00
Edward Thomson
c5b306020d v1.6: update the changelog 2023-02-24 22:21:41 +00:00
Edward Thomson
f7325c4480 Merge pull request #6503 from fxcoudert/hostandport
Pass hostkey & port to host verify callback
2023-02-24 13:41:57 -08:00
Edward Thomson
43e84e246c tests: validate host and port for ssh tests when non-standard 2023-02-24 21:11:58 +00:00
Francois-Xavier Coudert
f68b40c0af Pass hostkey & port to host verify callback
Co-authored-by: Stefan Karpinski <stefan@karpinski.org>
2023-02-24 21:11:58 +00:00
Edward Thomson
c2bdef6f3a net: parse urls or scp style paths in the same function 2023-02-24 21:11:58 +00:00
Edward Thomson
cfc3b3796a Merge pull request #6500 from timrogers/timrogers/empty-docs
Correct the definition of "empty" in the docs for `git_repository_is_empty`
2023-02-23 19:41:46 +00:00
Tim Rogers
86b532de15 Correct the definition of "empty" in the docs for git_repository_is_empty
This improves the documentation for `git_repository_is_empty`
which currently does not accurately describe libgit2's definition
of "empty".

It says that HEAD must point to the "unborn master branch", when
in fact, this is not the case if the repo's `init.defaultBranch`
configuration is set. If it is set, it will check that HEAD points
there. Only if it is not set does it fall back to `master`.
2023-02-23 18:47:03 +00:00
Edward Thomson
6f2eedb7eb Merge pull request #6499 from libgit2/ethomson/sha256_fix_2
odb: don't unconditionally add oid_type to stream
2023-02-23 15:39:12 +00:00
Edward Thomson
d16b59c91e odb: don't unconditionally add oid_type to stream
`git_odb_stream` should have an `oid_type` to disambiguate; that's not
necessary on non-experimental SHA256 builds. Avoid unnecessary ABI
breakage for consumers and hide it behind an ifdef for now.
2023-02-23 14:03:16 +00:00
Edward Thomson
bf7d3888d5 Merge pull request #6498 from libgit2/ethomson/httpproxy_env_tests
tests: always unset HTTP_PROXY before starting tests
2023-02-23 10:51:09 +00:00
Edward Thomson
80016e0e96 tests: always unset HTTP_PROXY before starting tests
The remote::httpproxy::env test (correctly) reset the environment before
running; however the other tests are also impacted by the environment
and need to have it isolated.
2023-02-23 10:19:19 +00:00
Edward Thomson
c9387a6165 Merge pull request #6497 from fxcoudert/ssh-agent-nonfatal
Make failure to connect to ssh-agent non-fatal
2023-02-22 23:58:57 +00:00
Edward Thomson
11579d591e Merge pull request #6494 from libgit2/ethomson/clarify_readme
README: clarify the linking exception
2023-02-22 23:50:04 +00:00
Edward Thomson
3ebe0741f7 Update README.md
Update based on carlosmn suggestions.
2023-02-22 22:44:03 +00:00
Francois-Xavier Coudert
d286952f9e Make failure to connect to ssh-agent non-fatal
Fixes https://github.com/libgit2/libgit2/issues/3866

Has been applied in all Julia builds since 2017:
https://github.com/JuliaLang/julia/pull/17459

Authored-by: Keno Fischer <kfischer@college.harvard.edu>
2023-02-22 10:53:23 +01:00
Edward Thomson
5561070c37 Merge pull request #6493 from libgit2/ethomson/ownership
Handle Win32 shares
2023-02-20 20:53:28 +00:00
Edward Thomson
3b7137415b README: clarify the linking exception
We say that you can link libgit2 "unmodified"... "without having to release
its source code". Clarify that you can modify libgit2 - but you must
release _its_ source code back - and you can link libgit2 without having
to release _your software's_ source code.
2023-02-20 20:37:45 +00:00
Edward Thomson
96e85df607 Merge pull request #6492 from cavaquinho/fix/bare-repo-oid-type
#6491: Sets oid_type on repos open with git_repository_open_bare
2023-02-20 20:30:16 +00:00
Edward Thomson
be3a78cc93 repo: support safe.directory with %(prefix)/
Git for Windows does some truly bizarre things with
paths that start with a forward slash; and expects you
to escape that with `%(prefix)`. This syntax generally
means to add the prefix that Git was installed to -- eg
`/usr/local` -- unless it's an absolute path, in which
case the leading `%(prefix)/` is just removed. And Git
for Windows expects you to use this syntax for absolute
Unix-style paths (in "Git Bash" or Windows Subsystem for
Linux).

Worse, the behavior used to be that a leading `/` was
not absolute. It would indicate that Git for Windows
should add the prefix. So `//` is required for absolute
Unix-style paths. Yes, this is truly horrifying.

Emulate that behavior, I guess, but only for absolute
paths. We won't deal with the Git install prefix. Also,
give WSL users an escape hatch where they don't have to
think about this and can use the literal path that the
filesystem APIs provide (`//wsl.localhost/...`).
2023-02-20 09:29:08 -08:00
Edward Thomson
1be7064943 repo: don't fail on strange win32 paths
With some paths on Win32, we cannot identify the owner because it's on a
file share (WSL2 or UNC). In that case, don't fail, but identify that
the current user does not own the path. This matches Git for Windows
behavior.
2023-02-18 13:17:44 -08:00
Miguel Arroz
2ae3bbf32b Deleted unused variable. 2023-02-17 11:14:24 -08:00
Miguel Arroz
c1b024fb4d #6491: Sets oid_type on repos open with git_repository_open_bare 2023-02-17 11:06:48 -08:00
Edward Thomson
795758d2ad Merge pull request #6487 from libgit2/ethomson/strarray-deprecate
stash: update strarray usage
2023-02-16 13:22:18 +00:00
Edward Thomson
797926633a stash: update strarray usage 2023-02-16 12:38:59 +00:00
Edward Thomson
05ba3fe4e1 Merge pull request #6330 from gitkraken-jacobw/partial-stashing
stash: partial stash specific files
2023-02-16 10:23:28 +00:00
Edward Thomson
7108b4318f Merge pull request #6486 from libgit2/ethomson/strarray-deprecate 2023-02-16 10:12:48 +00:00
Edward Thomson
7c6df9e125 strarray: remove deprecated declaration
`git_strarray_copy` is deprecated (and has been included in
`deprecated.h` for some time). It should not have remained in
the public `strarray.h`. Remove it.
2023-02-16 09:49:27 +00:00
Edward Thomson
35580d88a8 stash: fixes from code review 2023-02-16 09:11:57 +00:00
Edward Thomson
cefe6c4562 Merge pull request #6480 from libgit2/ethomson/warn
Fix some warnings in main
2023-02-15 13:57:09 +00:00
Edward Thomson
b8fff35ab3 tests: use static scope for test data 2023-02-15 10:08:42 +00:00
Edward Thomson
f892ec2add socket: mark flags as unused 2023-02-15 10:07:35 +00:00
Edward Thomson
bf2f44d601 Merge pull request #6479 from libgit2/ethomson/clone
clone: clean up options on failure
2023-02-15 00:14:48 +00:00
Edward Thomson
527be0a202 clone: clean up options on failure 2023-02-14 17:49:18 -05:00
Edward Thomson
80742e159c Merge pull request #6456 from libgit2/ethomson/sha256_experimental
SHA256: more SHA256 support
2023-02-14 17:01:23 +00:00
Edward Thomson
f7963f28ca Merge pull request #6455 from libgit2/ethomson/sysdir
Support the notion of a home directory separately from global configuration directory
2023-02-14 16:36:19 +00:00