libgit2 1.8.1 [email protected] 1.7.2 (new formula)

[branchvincent]

Created with brew bump-formula-pr.

release notes

v1.8
----
This is release v1.8.0, "Das Fliegende Klassenzimmer". This release includes optional, experimental support for invoking OpenSSH to fetch and push, an easier mechanism to perform the default behavior of git commit, and has many improvements for worktrees. This release also includes many other new features and bugfixes.
Major changes


Executable SSH (OpenSSH) support

libgit2 can now invoke the command-line OpenSSH to fetch from and push to remotes over SSH. This support takes the place of libssh2 support. To use it, configure libgit2 with cmake -DUSE_SSH=exec, and please report any problems that you discover. By @ethomson in Add OpenSSH support libgit2/libgit2#6617


Simplified commit creation

The git_commit_create_from_stage API was introduced to allow users to better emulate the behavior of git commit without needing to provide unnecessary information. The current state of the index is committed to the current branch. By @ethomson in commit: introduce git_commit_create_from_stage libgit2/libgit2#6716


Worktree improvements

A number of worktree improvements have been made for better compatibility with core git. First, libgit2 now understands per-worktree references, thanks to @csware in Make refdb_fs (hopefully) fully aware of per worktree refs libgit2/libgit2#6387. Worktree-specific configuration is now supported, thanks to @vermiculus in Support the extension for worktree-specific config libgit2/libgit2#6202. And improved compatibility with git worktree add is now supported, thanks to @herrerog in worktree: mimic 'git worktree add' behavior. libgit2/libgit2#5319.


Breaking changes


Adding WORKTREE configuration level (ABI breaking change)

To support worktree configurations at the appropriate level (higher priority than local configuration, but lower priority than app-specific configuration), the GIT_CONFIG_LEVEL_WORKTREE level was introduced at priority 6. GIT_CONFIG_LEVEL_APP now begins at priority 7.


Changes to git_config_entry (ABI breaking change) The git_config_entry structure now contains information about the backend_type and origin_path. The unused payload value has been removed.


git_push_options includes remote push options (ABI breaking change)

The git_push_options structure now contains a value for remote push options.


Other changes
New features

config: provide an "origin" for config entries by @ethomson in config: provide an "origin" for config entries libgit2/libgit2#6615
cli: add a git config command by @ethomson in cli: add a git config command libgit2/libgit2#6616
Add OpenSSH support by @ethomson in Add OpenSSH support libgit2/libgit2#6617
remote: optionally report unchanged tips by @ethomson in remote: optionally report unchanged tips libgit2/libgit2#6645
Support setting oid type for in-memory repositories by @kcsaul in Support setting oid type for in-memory repositories libgit2/libgit2#6671
cli: add index-pack command by @ethomson in cli: add index-pack command libgit2/libgit2#6681
Add git_repository_commit_parents to identify the parents of the next commit given the repository state by @ethomson in Add git_repository_commit_parents to identify the parents of the next commit given the repository state libgit2/libgit2#6707
commit: introduce git_commit_create_from_stage by @ethomson in commit: introduce git_commit_create_from_stage libgit2/libgit2#6716
set SSH timeout by @vafada in set SSH timeout libgit2/libgit2#6721
Implement push options on push by @russell in Implement push options on push libgit2/libgit2#6439
Support index.skipHash true config by @parnic in Support index.skipHash true config libgit2/libgit2#6738
worktree: mimic 'git worktree add' behavior. by @herrerog in worktree: mimic 'git worktree add' behavior. libgit2/libgit2#5319
Support the extension for worktree-specific config by @vermiculus in Support the extension for worktree-specific config libgit2/libgit2#6202
Separate config reader and writer backend priorities (for worktree configs) by @ethomson in Separate config reader and writer backend priorities (for worktree configs) libgit2/libgit2#6756
fetch: enable deepening/shortening shallow clones by @kempniu in fetch: enable deepening/shortening shallow clones libgit2/libgit2#6662

Bug fixes

repository: make cleanup safe for re-use with grafts by @carlosmn in repository: make cleanup safe for re-use with grafts libgit2/libgit2#6600
fix: Add missing include for oidarray. by @dvzrv in fix: Add missing include for oidarray. libgit2/libgit2#6608
ssh: fix known_hosts leak in _git_ssh_setup_conn by @steven9724 in ssh: fix known_hosts leak in _git_ssh_setup_conn libgit2/libgit2#6599
proxy: Return an error for invalid proxy URLs instead of crashing. by @lrm29 in proxy: Return an error for invalid proxy URLs instead of crashing. libgit2/libgit2#6597
errors: refactoring - never return NULL in git_error_last() by @ethomson in errors: refactoring - never return NULL in git_error_last() libgit2/libgit2#6625
Reject potential option injections over ssh by @carlosmn in Reject potential option injections over ssh libgit2/libgit2#6636
remote: fix memory leak in git_remote_download() by @7Ji in remote: fix memory leak in git_remote_download() libgit2/libgit2#6651
git2: Fix crash when called w/o parameters by @csware in git2: Fix crash when called w/o parameters libgit2/libgit2#6673
Avoid macro redefinition of ENABLE_INTSAFE_SIGNED_FUNCTIONS by @csware in Avoid macro redefinition of ENABLE_INTSAFE_SIGNED_FUNCTIONS libgit2/libgit2#6666
util: suppress some uninitialized variable warnings by @boretrk in util: suppress some uninitialized variable warnings libgit2/libgit2#6659
fetch: enable deepening/shortening shallow clones by @kempniu in fetch: enable deepening/shortening shallow clones libgit2/libgit2#6662
push: set generic error in push_negotiation cb by @ethomson in push: set generic error in push_negotiation cb libgit2/libgit2#6675
process: test /usr/bin/false on BSDs by @ethomson in process: test /usr/bin/false on BSDs libgit2/libgit2#6677
clone: don't mix up "http://url" with "http:/url" when figuring out if we should do a local clone by @boretrk in clone: don't mix up "http://url" with "http:/url" when figuring out if we should do a local clone libgit2/libgit2#6361
Several compatibility fixes by @ethomson in Several compatibility fixes libgit2/libgit2#6678
Git blame buffer gives the wrong result in many cases where there are… by @thosey in Git blame buffer gives the wrong result in many cases where there are… libgit2/libgit2#6572
Fix 'path cannot exist in repository' during diff for in-memory repository by @kcsaul in Fix 'path cannot exist in repository' during diff for in-memory repository libgit2/libgit2#6683
process: don't try to close the status by @ethomson in process: don't try to close the status libgit2/libgit2#6693
Minor bug fixes by @ethomson in Minor bug fixes libgit2/libgit2#6695
Bypass shallow clone support for in-memory repositories by @kcsaul in Bypass shallow clone support for in-memory repositories libgit2/libgit2#6684
examples: use unsigned int for bitfields by @ethomson in examples: use unsigned int for bitfields libgit2/libgit2#6699
Fix some bugs caught by UBscan by @ethomson in Fix some bugs caught by UBscan libgit2/libgit2#6700
git_diff_find_similar doesn't always remove unmodified deltas by @yori in git_diff_find_similar doesn't always remove unmodified deltas libgit2/libgit2#6642
httpclient: clear client->parser.data after use by @ethomson in httpclient: clear client->parser.data after use libgit2/libgit2#6705
Do not normalize safe.directory paths by @csware in Do not normalize safe.directory paths libgit2/libgit2#6668
clone: don't swallow error in should_checkout by @ethomson in clone: don't swallow error in should_checkout libgit2/libgit2#6727
Correct index add directory/file conflict detection by @ethomson in Correct index add directory/file conflict detection libgit2/libgit2#6729
Correct git_revparse_single and add revparse fuzzing by @ethomson in Correct git_revparse_single and add revparse fuzzing libgit2/libgit2#6730
config: properly delete or rename section containing multivars by @samueltardieu in config: properly delete or rename section containing multivars libgit2/libgit2#6723
revparse: ensure bare '@' is truly bare by @ethomson in revparse: ensure bare '@' is truly bare libgit2/libgit2#6742
repo: ensure we can initialize win32 paths by @ethomson in repo: ensure we can initialize win32 paths libgit2/libgit2#6743
Swap GIT_DIFF_LINE_(ADD|DEL)_EOFNL to match other Diffs by @xphoniex in Swap GIT_DIFF_LINE_(ADD|DEL)_EOFNL to match other Diffs libgit2/libgit2#6240
diff: fix test for SHA256 support in diff_from_buffer by @ethomson in diff: fix test for SHA256 support in diff_from_buffer libgit2/libgit2#6745
http: support empty http.proxy config setting by @ethomson in http: support empty http.proxy config setting libgit2/libgit2#6744
More safe.directory improvements by @ethomson in More safe.directory improvements libgit2/libgit2#6739
Ensure that completely ignored diff is empty by @ethomson in Ensure that completely ignored diff is empty libgit2/libgit2#5893
Fix broken regexp that matches submodule names containing ".path" by @csware in Fix broken regexp that matches submodule names containing ".path" libgit2/libgit2#6749
Fix memory leaks by @csware in Fix memory leaks libgit2/libgit2#6748
Make refdb_fs (hopefully) fully aware of per worktree refs by @csware in Make refdb_fs (hopefully) fully aware of per worktree refs libgit2/libgit2#6387
fix log example by @albfan in fix log example libgit2/libgit2#6359
fetch: fail on depth for local transport by @ethomson in fetch: fail on depth for local transport libgit2/libgit2#6757
Fix message trailer parsing by @ethomson in Fix message trailer parsing libgit2/libgit2#6761
config: correct fetching the HIGHEST_LEVEL config by @ethomson in config: correct fetching the HIGHEST_LEVEL config libgit2/libgit2#6766
Avoid some API breaking changes in v1.8 by @ethomson in Avoid some API breaking changes in v1.8 libgit2/libgit2#6768

Build and CI improvements

meta: update version numbers to v1.8 by @ethomson in meta: update version numbers to v1.8 libgit2/libgit2#6596
Revert "CMake: Search for ssh2 instead of libssh2." by @ethomson in Revert "CMake: Search for ssh2 instead of libssh2." libgit2/libgit2#6619
cmake: fix openssl build on win32 by @lazka in cmake: fix openssl build on win32 libgit2/libgit2#6626
ci: retry flaky online tests by @ethomson in ci: retry flaky online tests libgit2/libgit2#6628
ci: update to macOS 12 by @ethomson in ci: update to macOS 12 libgit2/libgit2#6629
Use #!/bin/bash for script with bash-specific commands by @roehling in Use #!/bin/bash for script with bash-specific commands libgit2/libgit2#6581
ci: overwrite nonsense in /usr/local during macOS setup by @ethomson in ci: overwrite nonsense in /usr/local during macOS setup libgit2/libgit2#6664
release: add a compatibility label by @ethomson in release: add a compatibility label libgit2/libgit2#6676
actions: set permissions by @ethomson in actions: set permissions libgit2/libgit2#6680
cmake: rename FindIconv to avoid collision with cmake by @ethomson in cmake: rename FindIconv to avoid collision with cmake libgit2/libgit2#6682
ci: allow workflows to read and write packages by @ethomson in ci: allow workflows to read and write packages libgit2/libgit2#6687
ci: allow workflows to push changes by @ethomson in ci: allow workflows to push changes libgit2/libgit2#6688
tests: remove test for strcasecmp by @boretrk in tests: remove test for strcasecmp libgit2/libgit2#6691
CI fixes by @ethomson in CI fixes libgit2/libgit2#6694
ci: improvements to prepare for Cygwin support by @ethomson in ci: improvements to prepare for Cygwin support libgit2/libgit2#6696
Yet more CI improvements by @ethomson in Yet more CI improvements libgit2/libgit2#6697
Fix nightly builds by @ethomson in Fix nightly builds libgit2/libgit2#6709
Benchmarks: add a site to view results by @ethomson in Benchmarks: add a site to view results libgit2/libgit2#6715
GIT_RAND_GETENTROPY: do not include sys/random.h by @semarie in GIT_RAND_GETENTROPY: do not include sys/random.h libgit2/libgit2#6736
add dl to LIBGIT2_SYSTEM_LIBS by @christopherfujino in add dl to LIBGIT2_SYSTEM_LIBS libgit2/libgit2#6631
meta: add dependency tag to release.yml by @ethomson in meta: add dependency tag to release.yml libgit2/libgit2#6740
CI: fix our nightlies by @ethomson in CI: fix our nightlies libgit2/libgit2#6751
trace: Re-enable tests as tracing is now enabled by default by @lrm29 in trace: Re-enable tests as tracing is now enabled by default libgit2/libgit2#6752
tests: don't free an unininitialized repo by @ethomson in tests: don't free an unininitialized repo libgit2/libgit2#6763
ci: reduce ASLR randomization for TSAN by @ethomson in ci: reduce ASLR randomization for TSAN libgit2/libgit2#6764
packbuilder: adjust nondeterministic tests by @ethomson in packbuilder: adjust nondeterministic tests libgit2/libgit2#6762
Allow libgit2 to be compiled with mbedtls3. by @adamharrison in Allow libgit2 to be compiled with mbedtls3. libgit2/libgit2#6759
build: update to latest actions versions by @ethomson in build: update to latest actions versions libgit2/libgit2#6765
ctype: cast characters to unsigned when classifying characters by @boretrk in ctype: cast characters to unsigned when classifying characters libgit2/libgit2#6679 and @ethomson in cast characters to unsigned when classifying characters libgit2/libgit2#6770
valgrind: suppress OpenSSL warnings by @ethomson in valgrind: suppress OpenSSL warnings libgit2/libgit2#6769
ci: split SHA256 builds out into their own workflow by @ethomson in ci: split SHA256 builds out into their own workflow libgit2/libgit2#6772

Documentation improvements

README.md: Fix link to conan packages by @lrm29 in README.md: Fix link to conan packages libgit2/libgit2#6621
README: replace gmaster with GitButler by @ethomson in README: replace gmaster with GitButler libgit2/libgit2#6692
blame example: Fix support for line range in CLI by @wetneb in blame example: Fix support for line range in CLI libgit2/libgit2#6638
Support authentication in push example by @pluehne in Support authentication in push example libgit2/libgit2#5904
docs: fix mistake in attr.h by @DavHau in docs: fix mistake in attr.h libgit2/libgit2#6714
Fix broken links by @csware in Fix broken links libgit2/libgit2#6747

Platform compatibility fixes

stransport: macOS: replace errSSLNetworkTimeout, with hard-coded value by @mascguy in stransport: macOS: replace errSSLNetworkTimeout, with hard-coded value libgit2/libgit2#6610

Git compatibility fixes

Do not trim dots from usernames by @georgthegreat in Do not trim dots from usernames libgit2/libgit2#6657
merge: fix incorrect rename detection for empty files. by @herrerog in merge: fix incorrect rename detection for empty files. libgit2/libgit2#6717

Dependency updates

zlib: upgrade bundled zlib to v1.3 by @ethomson in zlib: upgrade bundled zlib to v1.3 libgit2/libgit2#6698
ntlmclient: update to latest upstream ntlmclient by @ethomson in ntlmclient: update to latest upstream ntlmclient libgit2/libgit2#6704

New Contributors

@dvzrv made their first contribution in fix: Add missing include for oidarray. libgit2/libgit2#6608
@mascguy made their first contribution in stransport: macOS: replace errSSLNetworkTimeout, with hard-coded value libgit2/libgit2#6610
@steven9724 made their first contribution in ssh: fix known_hosts leak in _git_ssh_setup_conn libgit2/libgit2#6599
@lazka made their first contribution in cmake: fix openssl build on win32 libgit2/libgit2#6626
@roehling made their first contribution in Use #!/bin/bash for script with bash-specific commands libgit2/libgit2#6581
@7Ji made their first contribution in remote: fix memory leak in git_remote_download() libgit2/libgit2#6651
@kempniu made their first contribution in fetch: enable deepening/shortening shallow clones libgit2/libgit2#6662
@thosey made their first contribution in Git blame buffer gives the wrong result in many cases where there are… libgit2/libgit2#6572
@wetneb made their first contribution in blame example: Fix support for line range in CLI libgit2/libgit2#6638
@yori made their first contribution in git_diff_find_similar doesn't always remove unmodified deltas libgit2/libgit2#6642
@pluehne made their first contribution in Support authentication in push example libgit2/libgit2#5904
@DavHau made their first contribution in docs: fix mistake in attr.h libgit2/libgit2#6714
@vafada made their first contribution in set SSH timeout libgit2/libgit2#6721
@semarie made their first contribution in GIT_RAND_GETENTROPY: do not include sys/random.h libgit2/libgit2#6736
@christopherfujino made their first contribution in add dl to LIBGIT2_SYSTEM_LIBS libgit2/libgit2#6631
@parnic made their first contribution in Support index.skipHash true config libgit2/libgit2#6738
@samueltardieu made their first contribution in config: properly delete or rename section containing multivars libgit2/libgit2#6723
@xphoniex made their first contribution in Swap GIT_DIFF_LINE_(ADD|DEL)_EOFNL to match other Diffs libgit2/libgit2#6240
@adamharrison made their first contribution in Allow libgit2 to be compiled with mbedtls3. libgit2/libgit2#6759

Full Changelog: libgit2/libgit2@v1.7.0...v1.8.0

[bevanjkay]

@carlocab Should we wait for LLVM to land before doing too much here?

[carlocab]

@carlocab Should we wait for LLVM to land before doing too much here?

Yea, probably. We probably want to wait a bit for dependents to pick up compatibility anyway.

[github-actions]

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. To keep this pull request open, add a help wanted or in progress label.

[cho-m]

Similar to Python (pygit2) formulae, Rust (git2 / libgit2-sys) formulae are probably in a similar/slightly-worse situation as locked dependencies mean they can only use a specific major/minor libgit2.

Anyway, links to some upstream PRs / unreleased commits:

• libgit2-sys for Rust formulae: libgit2: Bump to v1.8.1 rust-lang/git2-rs#1032
• pygit2 for Python formulae: libgit2/pygit2@6d539d7
• julia - JuliaLang/julia@64de065
• libgit2-glib - https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40

[SMillerDev]

Merging #172078 into this and doing a rebase.

[ethomson]

I added a suggested change to bump to libgit2 v1.8.1. If that doesn't unblock us, I've prepared a v1.8.2 rc1 that reverts a change to git_commit functions. I'm not sure if that's really needed here or not, I'd love to understand better.

[SMillerDev]

Any way we can update the git crate in rust? https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md#0190---2024-06-13 should work.

[chenrui333]

@branchvincent Thanks for the great work on this!

[branchvincent]

thanks @bevanjkay and @SMillerDev for the help 💯

[github-actions]

❌ @branchvincent bottle request for cargo-c failed.

[carlocab]

Hi @ethomson, thanks for checking in!

👋 I'm sad to see this PR is so involved. Can you help me understand what the problem(s) is (are) and how I can help?

The difficulty with this PR is that we can only update the libgit2 formula when all its dependents are compatible with the new version.

We can of course, move some of the laggards to a [email protected] (which is what we've done here), but that solution isn't always ideal:

• that means an extra formula that we have to maintain
• this isn't always possible because this can sometimes result in formulae depending on two different versions of libgit2 simultaneously (e.g. A depends on B and C, but B depends on the latest libgit2 but C depends on an older libgit2)

Do we need to drag the entire ecosystem along because we made an ABI change or updated the soversion? If so, it looks like we need to be much more aggressive about ABI compatibility in the future.

Being more careful about maintaining ABI compatibility would indeed help! Your security policy of supporting the latest two versions is also helpful for us (because that allows us to package a slightly older version), but we'd love it if the typical libgit2 upgrade was ABI compatible with the older one (for reasons discussed above).

[ethomson]

Thanks for the details. These are often things that seem not so obvious in the small scale. It's only when you see them in the macro that you realize just how gnarly this is. 🙏

[injust]

I think this broke the git-interactive-rebase-tool formula. How can I work around this and similar issues in the meantime?

[branchvincent]

oops, not sure how that was missed. #177681 will fix

[darthShadow]

Looks like jj also got missed from this: #177686