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.

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

git: 2.17.1 -> 2.18.0 #42376

Merged
merged 6 commits into from Jun 23, 2018
Merged

git: 2.17.1 -> 2.18.0 #42376

merged 6 commits into from Jun 23, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 22, 2018

New release! :)

Release notes: https://github.com/git/git/blob/master/Documentation/RelNotes/2.18.0.txt

  • 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)
    • Before: 215181576
    • After: 218954256
  • Fits CONTRIBUTING.md.

Not unsuited for merging but I had to disable a number of tests that were failing,
and would appreciate help investigating them further in case they indicate
problems that really should be fixed.

@dtzWill
Copy link
Member Author

dtzWill commented Jun 22, 2018

cc @layus @matthewbauer @NeQuissimus as being involved in recent updates to this package.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: git

Partial log (click to expand)

All tests successful.
Files=815, Tests=19066, 201 wallclock secs (90.30 usr 16.37 sys + 2738.65 cusr 7628.02 csys = 10473.34 CPU)
Result: PASS
make clean-except-prove-cache
make[2]: Entering directory '/build/git-2.18.0/t'
rm -f -r 'trash directory'.* 'test-results'
rm -f -r valgrind/bin
make[2]: Leaving directory '/build/git-2.18.0/t'
make[1]: Leaving directory '/build/git-2.18.0/t'
/nix/store/cqpsjhwrib24hm6fbdgdhlh67l2dj01f-git-2.18.0

@dtzWill
Copy link
Member Author

dtzWill commented Jun 22, 2018 •
edited

Tests newly failing (perhaps didn't exist previously, haven't checked):

t9902-completion

"sourcing the completion script clears cached --options" -- I'm seeing this in the logs which seems likely to be related but I'm not sure:

/build/git-2.18.0/t/../contrib/completion/git-completion.bash: line 354: compgen: command not found

This is printed even when the failing sub-test is disabled, but may be worth checking anyway.

editor with a space

Not sure why these fail, perhaps tests end up using the sandbox shell instead of bash? Might be good to double-check the installed result manually re:ensuring this behavior isn't broken.

split-index

Still fails, still unsure what's going on here :(.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: git

Partial log (click to expand)

All tests successful.
Files=815, Tests=19066, 492 wallclock secs ( 4.72 usr  0.96 sys + 271.54 cusr 269.48 csys = 546.70 CPU)
Result: PASS
make clean-except-prove-cache
make[2]: Entering directory '/build/git-2.18.0/t'
rm -f -r 'trash directory'.* 'test-results'
rm -f -r valgrind/bin
make[2]: Leaving directory '/build/git-2.18.0/t'
make[1]: Leaving directory '/build/git-2.18.0/t'
/nix/store/lnd7m264dhckk7bp3h196n1vwg8j5mvp-git-2.18.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: git

Partial log (click to expand)

t6035-merge-dir-to-symlink.sh ...................... ok
t6036-recursive-corner-cases.sh .................... ok
t6037-merge-ours-theirs.sh ......................... ok
t6038-merge-text-auto.sh ........................... ok
t6039-merge-ignorecase.sh .......................... ok
t6040-tracking-info.sh ............................. ok
t6041-bisect-submodule.sh .......................... ok
t6042-merge-rename-corner-cases.sh ................. ok
building of '/nix/store/l0xnd6673k7sa7nwar6hihk3wsh9iczw-git-2.18.0.drv' timed out after 1800 seconds
�[31;1merror:�[0m build of '/nix/store/l0xnd6673k7sa7nwar6hihk3wsh9iczw-git-2.18.0.drv' failed

@dtzWill
Copy link
Member Author

dtzWill commented Jun 22, 2018

@GrahamcOfBorg build git

(maybe Darwin build will complete tests before timing out on a second try? O:))

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: git

Partial log (click to expand)

/nix/store/lnd7m264dhckk7bp3h196n1vwg8j5mvp-git-2.18.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: git

Partial log (click to expand)

/nix/store/cqpsjhwrib24hm6fbdgdhlh67l2dj01f-git-2.18.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: git

Partial log (click to expand)

t3701-add-interactive.sh ........................... ok
t3702-add-edit.sh .................................. ok
t3703-add-magic-pathspec.sh ........................ ok
t3800-mktag.sh ..................................... ok
t3900-i18n-commit.sh ............................... ok
t3901-i18n-patch.sh ................................ ok
t3902-quoted.sh .................................... ok
t3903-stash.sh ..................................... ok
building of '/nix/store/l0xnd6673k7sa7nwar6hihk3wsh9iczw-git-2.18.0.drv' timed out after 1800 seconds
�[31;1merror:�[0m build of '/nix/store/l0xnd6673k7sa7nwar6hihk3wsh9iczw-git-2.18.0.drv' failed

@dtzWill
Copy link
Member Author

dtzWill commented Jun 22, 2018

Can a @NixOS/darwin-maintainers confirm this doesn't break the build on Darwin? Borg is timing out on the tests :3.

LnL7
LnL7 approved these changes Jun 22, 2018
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

darwin build looks good

@flokli
Copy link
Contributor

flokli commented Jun 22, 2018

@dtzWill looks good here as well.

@NeQuissimus NeQuissimus merged commit 2624f90 into NixOS:master Jun 23, 2018
@xeji
Copy link
Contributor

xeji commented Jun 24, 2018 •
edited

@dtzWill this appears to break fetchgit in some cases, see #41414 (comment)

Edit: same error in #42432

@worldofpeace worldofpeace mentioned this pull request Jun 25, 2018
Merged
9 tasks
@dtzWill
Copy link
Member Author

dtzWill commented Jun 25, 2018

I'm a bit short on time for nixpkgs things tonight/next few days, so unless someone else steps up I vote reverting the update until we can sort this out.

Very sorry for the breakage, thanks for tracking it to the update and I'm sure we'll sort it out properly soon.

dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Jun 25, 2018
@dtzWill
Revert "Merge pull request NixOS#42376 from dtzWill/update/git-2.18.0"
6d1955e 
This reverts commit 2624f90, reversing
changes made to 37aab4c.

See:
NixOS#42376 (comment)

Basically this breaks at least some users of fetchgit,
so let's revert this until this is sorted out.
@dtzWill dtzWill mentioned this pull request Jun 25, 2018
Merged
9 tasks
dtzWill added a commit that referenced this pull request Jun 25, 2018
@dtzWill
Merge pull request #42549 from dtzWill/fix/revert-git-2.18.0-update
ee46b71 
Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"
@xeji
Copy link
Contributor

xeji commented Jun 25, 2018

Thank you!

@layus
Copy link
Member

layus commented Jun 25, 2018

Okay, so the issue comes from upstream (git/git@0b5e2ea) that changed the output format of git submodule status to avoid printing ((null)) when the name is not known.

I modified the regex to make this third part optional: dtzWill#1

@dtzWill Just merge the PR, and test/resubmit ;-)

dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Jun 25, 2018
@dtzWill
Revert "Revert "Merge pull request NixOS#42376 from dtzWill/update/gi…
6f75ae6 
…t-2.18.0""

This reverts commit 6d1955e.
@dtzWill dtzWill mentioned this pull request Jun 25, 2018
Merged
9 tasks
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Jun 28, 2018
@dtzWill
Revert "Revert "Merge pull request NixOS#42376 from dtzWill/update/gi…
bb00076 
…t-2.18.0""

This reverts commit 6d1955e.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

@NeQuissimus NeQuissimus NeQuissimus approved these changes

@LnL7 LnL7 LnL7 approved these changes

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

Successfully merging this pull request may close these issues.

None yet
8 participants
@dtzWill @GrahamcOfBorg @flokli @xeji @layus @matthewbauer @NeQuissimus @LnL7