Commit Graph

14895 Commits

Author SHA1 Message Date
Edward Thomson
c058aa87dc Merge pull request #6534 from libgit2/ethomson/v1.6.3
v1.6.3
v1.6.3
2023-03-21 03:52:21 -07:00
Edward Thomson
a1826a8b1b v1.6.3: update changelog 2023-03-21 10:15:25 +00:00
Edward Thomson
2173ca8a41 v1.6.3: update version numbers 2023-03-21 10:13:23 +00:00
Edward Thomson
1b929b3d85 Merge pull request #6530 from libgit2/cmn/pack-index-64
pack: use 64 bits for the number of objects
2023-03-16 02:48:59 -07:00
Carlos Martín Nieto
1d57344cdf pack: cast to uint64_t when calculating index size instead
It is a bit too hidden why we want 64 bits when we're assigning to a 32-bit
integer later on to store the number of objects, so go back to uint32_t and cast
to uint64_t during the size calculation.
2023-03-16 09:21:37 +01:00
Carlos Martín Nieto
62b9f80357 pack: use 64 bits for the number of objects
Keeping it as a 32-bit value means the min size calculation overflows or gets
truncated which can lead to issues with large packfiles.
2023-03-14 15:57:49 +01:00
Edward Thomson
8f8e805e3f Merge pull request #6529 from libgit2/ethomson/include_sanity
cmake: don't include `include/git2`
2023-03-11 05:57:19 -08:00
Edward Thomson
cbc5c6adfa cmake: don't include include/git2
Including the `include/git2` build path is a seemingly unnecessary
oversight to include the generated `experimental.h` file.
2023-03-10 22:45:24 +00:00
Edward Thomson
d066d0d95c Merge pull request #6527 from Batchyx/batchyx/wchar-fixes 2023-03-08 09:11:03 -08:00
Nicolas Cavallari
20811c5aa9 sysdir: Do not declare win32 functions on non-win32 platforms
These declaration poses problems on some embedded or retro Linux systems
that deliberately disable support for wchar_t from their libc.
2023-03-08 14:00:52 +01:00
Edward Thomson
8164b48162 Merge pull request #6521 from libgit2/ethomson/weird_ignore 2023-03-03 04:38:10 -08:00
Edward Thomson
129cadf9bf index: support git_index_add_all directories with force
When the contents of an entire new directory is ignored, and `FORCE` is
specified to `git_index_add_all`, ensure that we expand the entire file
list. By default, diff will coalesce a fully ignored folder into a
single diff entry; expand it.
2023-03-02 23:22:01 +00:00
Edward Thomson
309befe413 index: test git_index_add_all with force
Ensure that when all files beneath a directory are ignored that we
add the files when FORCE is specified.
2023-03-02 23:21:50 +00:00
Edward Thomson
6fb5ab3723 index: test git_index_add_all with ignored folder
Ensure that when all files beneath a directory are ignored that we
actually ignore the files.
2023-03-02 23:09:36 +00:00
Edward Thomson
af12fc11c5 Merge pull request #6520 from libgit2/ethomson/git_odb_open
odb: restore `git_odb_open`
2023-03-02 01:31:57 -08:00
Edward Thomson
7445d510be Merge pull request #6513 from libgit2/ethomson/util_test_root
fs_path: let root run the ownership tests
2023-03-01 16:19:56 -08:00
Edward Thomson
c59d519c49 Merge pull request #6518 from georgthegreat/patch-1
Remove unused wditer variable
2023-03-01 16:19:11 -08:00
Edward Thomson
e1e0d77c6f odb: restore git_odb_open
`git_odb_open` was erroneously removed during a refactoring; add it
back.
2023-03-01 22:16:31 +00:00
Yuriy Chernyshov
3770bf6766 Remove unused wditer variable
Found this randomly while debugging #6517
2023-02-28 19:03:51 +03:00
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
5c1d764910 fs_path: let root run the ownership tests
The `git_fs_path_owner_is_current_user` expects the root dir on unix
(`/`) to be owned by a non-current user. This makes sense unless root
(or euid == 0) is running the tests, which often happens during distro
build / packaging scripts. Allow them to run the tests.
2023-02-27 21:52:33 +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