Skip to content
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

Jump to bottom

git: build diff-highlight if Perl support is enabled #56069

Merged
merged 1 commit into from Jun 14, 2019
Merged

git: build diff-highlight if Perl support is enabled #56069

merged 1 commit into from Jun 14, 2019

Conversation

delroth
Copy link
Contributor

@delroth delroth commented Feb 19, 2019

Motivation for this change

Fixes #27671.

git/git@0c977db made that script require an extra build step.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@delroth
git: build diff-highlight if Perl support is enabled
ce15daf 
Fixes NixOS#27671.

git/git@0c977db made that script
require an extra build step.
@delroth delroth changed the base branch from master to staging-next February 20, 2019 00:13
@delroth
Copy link
Contributor Author

delroth commented Feb 20, 2019

Gah, github is being stupid with switching base branch for the PR and decided to involve the whole world on this change. Sorry, not sure how to avoid that!

@ryantm
Copy link
Member

ryantm commented Feb 20, 2019

@delroth the easiest way I know how to avoid this is to base all your commits on the merge-base of both branches you want to switch between, usually staging and master.

@delroth
Copy link
Contributor Author

delroth commented Feb 20, 2019

Makes sense, I'll give that a shot next time.

@xeji
Copy link
Contributor

xeji commented Feb 25, 2019

@GrahamcOfBorg build git

@infinisil
Copy link
Member

Shouldn't this go to staging instead of staging-next?

@FRidh
Copy link
Member

FRidh commented Mar 6, 2019

staging indeed.

@matthewbauer matthewbauer changed the base branch from staging-next to staging June 11, 2019 01:37
@ofborg ofborg bot requested review from the-kenny, peti and wmertens June 11, 2019 01:51
@peti peti changed the base branch from staging to master June 14, 2019 15:26
@peti peti merged commit eeffb47 into NixOS:master Jun 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@the-kenny the-kenny Awaiting requested review from the-kenny

@peti peti Awaiting requested review from peti

@wmertens wmertens Awaiting requested review from wmertens

Assignees
No one assigned
Labels
10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Git's diff-highlight script disappeared (perl)
7 participants
@delroth @ryantm @xeji @infinisil @FRidh @peti @GrahamcOfBorg