git: 2.19.2 -> 2.20.1 #52575
git: 2.19.2 -> 2.20.1 #52575
Conversation
Not sure what the i18n patch is for, dropping it for now since tests pass w/o it. Tests pass, woo :).
gettext-posion test fails, bah. Snippet: ``` t0205-gettext-poison.sh ............................ not ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison not ok 2 - gettext: our gettext() fallback has poison semantics not ok 3 - eval_gettext: our eval_gettext() fallback has poison semantics Dubious, test returned 1 (wstat 256, 0x100) Failed 3/3 subtests ```
|
Yep, they pass for borg too it appears? |
|
|
From git-archaeology, this is the cause of the gettext patch being added: #13047. |
|
Hmm, can't reproduce? But not sure I understand the problem -- the example git commands are all referencing invalid upstreams/revisions, yes? Anyone want to weigh in, or is this good to go? |
|
One fix that I have thought of is to modify the gettext patch so that it points to '${gettext}' when not in test environment, but leave the script to search from $PATH when it is in test environment. |
|
2.21.0 is out, updating to it is just the normal version/hash bump on top of this. |
|
This pull request has been mentioned on Nix community. There might be relevant details there: https://discourse.nixos.org/t/nixos-19-03-feature-freeze/1950/37 |
|
dtzWill@94d5f77 for example. |
| @@ -42,7 +42,7 @@ stdenv.mkDerivation { | |||
|
|
|||
| patches = [ | |||
| ./docbook2texi.patch | |||
| ./git-sh-i18n.patch | |||
| #./git-sh-i18n.patch | |||
There was a problem hiding this comment.
Should this line (and the patch) be removed instead?
|
cc: @zimbatm for the gettext patch. |
|
Looks like someone tackled the i18n patch properly, closing in favor of that PR: #56376 . |
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.20.1.txt
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.20.0.txt
Motivation for this change
Commits can (should?) be squashed, but wanted to show the path taken
and be sure to draw attention to the git-sh-i18n bits.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)