Skip to content

git: 2.35.0 -> 2.35.1#157281

Merged
primeos merged 1 commit intoNixOS:stagingfrom
primeos:git
Jan 29, 2022
Merged

git: 2.35.0 -> 2.35.1#157281
primeos merged 1 commit intoNixOS:stagingfrom
primeos:git

Conversation

@primeos
Copy link
Member

@primeos primeos commented Jan 29, 2022 •
edited
Loading

From the release notes 0:

Git 2.35 shipped with a regression that broke use of "rebase" and
"stash" in a secondary worktree. This maintenance release ought to
fix it.

Motivation for this change

#156610 is still only in staging so we're fine :)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@primeos
git: 2.35.0 -> 2.35.1
6c77104 
From the release notes [0]:
> Git 2.35 shipped with a regression that broke use of "rebase" and
> "stash" in a secondary worktree.  This maintenance release ought to
> fix it.

[0]: https://github.com/git/git/blob/v2.35.1/Documentation/RelNotes/2.35.1.txt
@ofborg ofborg bot requested review from globin and wmertens January 29, 2022 13:25
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 29, 2022
@primeos primeos merged commit 39c68d7 into NixOS:staging Jan 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@globin globin Awaiting requested review from globin

@wmertens wmertens Awaiting requested review from wmertens

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@primeos