git-branchless: add patch for test failures with latest Git#182370
Merged
kevincox merged 1 commit intoNixOS:masterfrom Jul 25, 2022
msfjarvis:hs/2022-07-21/fix-git-branchless
Merged
git-branchless: add patch for test failures with latest Git#182370kevincox merged 1 commit intoNixOS:masterfrom msfjarvis:hs/2022-07-21/fix-git-branchless
kevincox merged 1 commit intoNixOS:masterfrom
msfjarvis:hs/2022-07-21/fix-git-branchless
Conversation
Member
|
I'll just ask for a new release upstream, that's easier than cherry-picking fixes. |
Mic92
reviewed
Jul 24, 2022
pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
Outdated
Show resolved
Hide resolved
Member
|
I've already emailed the upstream maintainer about it. Normally @arxanas acts quite fast. |
hmenke
approved these changes
Jul 25, 2022
Member
hmenke
left a comment
There was a problem hiding this comment.
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.
Contributor
|
Result of 1 package built:
|
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes