diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-22 18:06:10 -0500 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-04-12 08:55:31 +0200 |
| commit | 281775bb1a0c24468f1ad961b4c53e0074db675e (patch) | |
| tree | ea7cb10b850409aeb0da3b3a0d07ffbc9dfa8c67 /pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch | |
| parent | 38e04bbf29fe3b6af26b3505a42ce5871aeac17d (diff) | |
| download | nixlib-281775bb1a0c24468f1ad961b4c53e0074db675e.tar nixlib-281775bb1a0c24468f1ad961b4c53e0074db675e.tar.gz nixlib-281775bb1a0c24468f1ad961b4c53e0074db675e.tar.bz2 nixlib-281775bb1a0c24468f1ad961b4c53e0074db675e.tar.lz nixlib-281775bb1a0c24468f1ad961b4c53e0074db675e.tar.xz nixlib-281775bb1a0c24468f1ad961b4c53e0074db675e.tar.zst nixlib-281775bb1a0c24468f1ad961b4c53e0074db675e.zip | |
git: 2.16.2 -> 2.16.3
Cherry picked from 260194193c333a3d in staging as suggested by https://github.com/NixOS/nixpkgs/pull/38763#issuecomment-380504142.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f..216c0e56b44c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh |