Skip to content

git-branchless: add patch for test failures with latest Git#182370

Merged
kevincox merged 1 commit intoNixOS:masterfrom
msfjarvis:hs/2022-07-21/fix-git-branchless
Jul 25, 2022
Merged

git-branchless: add patch for test failures with latest Git#182370
kevincox merged 1 commit intoNixOS:masterfrom
msfjarvis:hs/2022-07-21/fix-git-branchless

Conversation

@msfjarvis
Copy link
Contributor

Description of changes

Adds a patch to git-branchless that resolves test failures with the current version of Git in the nixpkgs tree.

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.11 Release Notes (or backporting 22.05 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.

@msfjarvis msfjarvis mentioned this pull request Jul 21, 2022
13 tasks
@ofborg ofborg bot requested review from hmenke and nh2 July 21, 2022 19:46
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 21, 2022
@hmenke
Copy link
Member

hmenke commented Jul 22, 2022

I'll just ask for a new release upstream, that's easier than cherry-picking fixes.

@msfjarvis msfjarvis requested a review from Mic92 July 24, 2022 05:58
@hmenke
Copy link
Member

hmenke commented Jul 25, 2022

I've already emailed the upstream maintainer about it. Normally @arxanas acts quite fast.

Copy link
Member

@hmenke hmenke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to upstream a new release is not possible at this point because there are some features in the backlog that have to be completed first. A new tag has been created which we could in principle use: https://github.com/arxanas/git-branchless/releases/tag/v0.3.13-pre.0
Since the next proper release will take some more time, cherry-picking the fix is a good solution for now.

@kevincox
Copy link
Contributor

Result of nixpkgs-review pr 182370 run on x86_64-linux 1

1 package built:
  • git-branchless

@kevincox kevincox merged commit a7ee155 into NixOS:master Jul 25, 2022
@msfjarvis msfjarvis deleted the hs/2022-07-21/fix-git-branchless branch July 25, 2022 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants