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.0 -> 2.17.1 #41223

Closed
wants to merge 1 commit into from
Closed

git: 2.17.0 -> 2.17.1 #41223

wants to merge 1 commit into from

Conversation

tilpner
Copy link
Member

@tilpner tilpner commented May 29, 2018

Trivial bump for minor version update, nothing else should need changing

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@FRidh
Copy link
Member

FRidh commented May 29, 2018

Let's hope it goes smoother than the "2.16.2 -> 2.17.0" bump :-)
#38636 (comment)

@xeji
Copy link
Contributor

xeji commented May 29, 2018

Mainly security fixes, changelog: https://github.com/git/git/blob/master/Documentation/RelNotes/2.17.1.txt

@xeji
Copy link
Contributor

xeji commented May 29, 2018

@GrahamcOfBorg build git

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: git

Partial log (click to expand)

All tests successful.
Files=802, Tests=18597, 191 wallclock secs ( 4.90 usr  0.99 sys + 260.37 cusr 254.18 csys = 520.44 CPU)
Result: PASS
make clean-except-prove-cache
make[2]: Entering directory '/build/git-2.17.1/t'
rm -f -r 'trash directory'.* 'test-results'
rm -f -r valgrind/bin
make[2]: Leaving directory '/build/git-2.17.1/t'
make[1]: Leaving directory '/build/git-2.17.1/t'
/nix/store/jzjg4p0vrhsv0q9jpppxmp0xpdlfy78a-git-2.17.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: git

Partial log (click to expand)

All tests successful.
Files=802, Tests=18597, 199 wallclock secs (86.76 usr 16.14 sys + 2782.32 cusr 7045.59 csys = 9930.81 CPU)
Result: PASS
make clean-except-prove-cache
make[2]: Entering directory '/build/git-2.17.1/t'
rm -f -r 'trash directory'.* 'test-results'
rm -f -r valgrind/bin
make[2]: Leaving directory '/build/git-2.17.1/t'
make[1]: Leaving directory '/build/git-2.17.1/t'
/nix/store/02nld2hldjjr57xrznvxckwpyzy2xajj-git-2.17.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: git

Partial log (click to expand)

t0050-filesystem.sh                              (Wstat: 256 Tests: 10 Failed: 2)
  Failed tests:  9-10
  Non-zero exit status: 1
Files=802, Tests=18590, 412 wallclock secs ( 6.31 usr  2.91 sys + 1026.82 cusr 1459.25 csys = 2495.29 CPU)
Result: FAIL
make[1]: *** [Makefile:47: prove] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-git-2.17.1.drv-0/git-2.17.1/t'
make: *** [Makefile:2484: test] Error 2
builder for '/nix/store/4hfknim57lgd8iqi7z8j39xh5sr5nlib-git-2.17.1.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/4hfknim57lgd8iqi7z8j39xh5sr5nlib-git-2.17.1.drv' failed

@xeji
Copy link
Contributor

xeji commented May 29, 2018 •
edited

Failed tests on Darwin don't look nice

t0050-filesystem.sh ................................
not ok 9 - rename (silent unicode normalization)
not ok 10 - merge (silent unicode normalization)
Dubious, test returned 1 (wstat 256, 0x100)
Failed 2/10 subtests

@orivej
Copy link
Contributor

orivej commented May 30, 2018

@NeQuissimus has commited this in 9db1f48

@orivej orivej closed this May 30, 2018
@NeQuissimus
Copy link
Member

Oh, my bad, I did not see this PR!

@orivej orivej added 1.severity: security 9.needs: port to stable A PR needs a backport to the stable release. labels May 30, 2018
@orivej orivej mentioned this pull request May 30, 2018
Merged
8 tasks
@orivej orivej removed the 9.needs: port to stable A PR needs a backport to the stable release. label May 30, 2018
@orivej
Copy link
Contributor

orivej commented May 30, 2018

This bugfix was also released in 2.16.4, so I propose to update the release branch to that version in #41244.

@tilpner tilpner deleted the git-update branch July 10, 2018 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
1.severity: security 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
6 participants
@tilpner @FRidh @xeji @GrahamcOfBorg @orivej @NeQuissimus