-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git: 2.47.2 -> 2.48.1 #372784
base: staging
Are you sure you want to change the base?
git: 2.47.2 -> 2.48.1 #372784
Conversation
@ofborg build git gitFull git.passthru.tests nixpkgs-manual nixpkgs-manual.tests |
Note this will be need to be bumped to 2.48.1 to include fixes for CVE-2024-50349 and CVE-2024-52006 (see also #373801) |
I've updated this PR to target Git v2.48.1 rather than v2.48.0. I'm not adding the security tag as I think the security issue is better addressed by #373801. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The commit message and PR title should not contain the v prefix.
Fixed, thank you! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
This version fixes security vulnerabilities (https://github.blog/open-source/git/git-security-vulnerabilities-announced-5/). Can we get this merged asap? |
I've merged the small update. Can you rebase this on staging to fix the conflict? |
For build process clarity, build documentation during the build phase. Without this change, the docs are built during the install phase as that's when `make` realises they're not yet present. This also means that the main Git documentation is built before the contrib/subtree documentation, which is necessary for the subtree documentation to build successfully in Git v2.48.0-rc0 and -rc1 (and presumably therefore in v2.48.0 when it is released).
@SuperSandro2000 done! Updated branch with updated commit message for the new version change. |
Changelogs:
This also includes one commit from #370888, which is necessary for the build to complete.
No substantial changes that affect backwards compatibility AFAICS, so I don't think there's a need for a release note.
Haven't tested all executables in
bin/
, but I did checkgit --version
as a quick test on top of the test suite and that's fine. Builds ofnixosTests.gitdaemon
,git.passthru.tests
andtests.fetchgit
, as safety checks, are on my system now.Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.