diff options
| author | Peter Simons <simons@cryp.to> | 2018-04-11 09:51:06 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-04-11 09:51:06 +0200 |
| commit | e4fd05449ede28da9672e4b96021fb2a7a949f3e (patch) | |
| tree | f797b09ecf362dc481f2aca8b5173e05dc414ef5 /pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch | |
| parent | 4ee2ac646ecd76a4686311e6d4fa64ee5a84fcaf (diff) | |
| download | nixlib-e4fd05449ede28da9672e4b96021fb2a7a949f3e.tar nixlib-e4fd05449ede28da9672e4b96021fb2a7a949f3e.tar.gz nixlib-e4fd05449ede28da9672e4b96021fb2a7a949f3e.tar.bz2 nixlib-e4fd05449ede28da9672e4b96021fb2a7a949f3e.tar.lz nixlib-e4fd05449ede28da9672e4b96021fb2a7a949f3e.tar.xz nixlib-e4fd05449ede28da9672e4b96021fb2a7a949f3e.tar.zst nixlib-e4fd05449ede28da9672e4b96021fb2a7a949f3e.zip | |
git: revert "2.16.2 -> 2.17.0"
This reverts commit 5d65b4ebeb6b2294654b3562fb15d7fa94751522, because it broke git-add. See https://github.com/NixOS/nixpkgs/pull/38636#issuecomment-380182555 for details.
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 216c0e56b44c..97f50064bc3f 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 "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison --elif test -n "@@USE_GETTEXT_SCHEME@@" +-if 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 |