Skip to content

git: 2.19.2 -> 2.21.0 #56376

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.

Sign up for GitHub

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
Merged
merged 1 commit into from
Mar 15, 2019
Merged

git: 2.19.2 -> 2.21.0 #56376

merged 1 commit into from
Mar 15, 2019
+40 −107

Conversation

artemist
Copy link
Member

@artemist artemist commented Feb 25, 2019 •
edited
Loading

Motivation for this change

Git 2.19.2 is out of date

Things done

I modified default.nix, then rebased all patches onto git 2.21.0. I had to make significant modifications to git-sh-i18n.patch to allow it to pass tests. All tests pass for gitFull and git-annex, which relies on gitBase. I have nowhere near the computing power to test all reliant packages, however. This commit was made using this updated git.

  • 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.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added the 8.has: documentation This PR adds or changes documentation label Feb 25, 2019
xeji
xeji previously requested changes Feb 25, 2019
View reviewed changes
Copy link
Contributor

@xeji xeji left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Please rebase this PR on the staging branch since it causes a mass rebuild of "nearly everything" (I'm exaggerating here..)

@artemist artemist changed the base branch from master to staging February 25, 2019 19:32
@xeji
Copy link
Contributor

xeji commented Feb 25, 2019

Nevermind all these review requests, changing base tends to confuse ofborg a little...

@xeji xeji dismissed their stale review February 25, 2019 19:36

resolved

@GrahamcOfBorg GrahamcOfBorg added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: qt/kde 6.topic: stdenv Standard environment 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` labels Feb 25, 2019
@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 25, 2019
@xeji xeji removed the request for review from matthewbauer February 25, 2019 19:39
@artemist
Copy link
Member Author

It's hard to tell if i18n is working properly. My laptop is in German, but only shell utilities would care about the i18n shell patch, and most of these don't have translations. The C i18n is working fine, as my git is still in German, for what it's worth.

@GrahamcOfBorg GrahamcOfBorg removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: qt/kde 6.topic: stdenv Standard environment 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels Feb 25, 2019
@dtzWill
Copy link
Member

dtzWill commented Feb 26, 2019

Thanks for tackling this!

@dtzWill dtzWill mentioned this pull request Feb 26, 2019
Closed
10 tasks
@artemist
Copy link
Member Author

artemist commented Feb 26, 2019 •
edited
Loading

Update: I can confirm i18n is working. git bisect, a shell utility, is translating to my strings into my local language, and shell utilities respond correctly to the test variable, GIT_TEST_GETTEXT_POISON=1.

Additionally, I just rebuilt my system on top of the new git. After around 24h, it fully built and works fine.

@alyssais
Copy link
Member

@GrahamcOfBorg build git gitFull

@dtzWill
Copy link
Member

dtzWill commented Mar 15, 2019

@GrahamcOfBorg build git gitFull

@artemist
Copy link
Member Author

git and gitFull do build on my x86_64 NixOS machine, so it seems that is just a timeout issue. I'm not sure what's happening with MacOS, and don't have a machine I can test on right now.

@xeji
Copy link
Contributor

xeji commented Mar 15, 2019

Darwin failure looks unrelated, it's just a bunch of dependencies that currently fail on staging. So let's merge this now.

@xeji xeji merged commit bc92dd6 into NixOS:staging Mar 15, 2019
@rgarza rgarza mentioned this pull request Apr 15, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji

@peti peti

@the-kenny the-kenny

@wmertens wmertens

Assignees
No one assigned
Labels
8.has: documentation This PR adds or changes documentation 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.

None yet
5 participants
@artemist @xeji @dtzWill @alyssais @GrahamcOfBorg