Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #56376 from artemist/git-2.21.0
git: 2.19.2 -> 2.21.0
- Loading branch information
Showing
6 changed files
with
40 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 6 additions & 4 deletions
10
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 19 additions & 90 deletions
109
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,23 @@ | ||
| diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh | ||
| index e1d917fd27..e90f8e1414 100644 | ||
| --- a/git-sh-i18n.sh | ||
| +++ b/git-sh-i18n.sh | ||
| @@ -15,87 +15,11 @@ | ||
| fi | ||
| export TEXTDOMAINDIR | ||
|
|
||
| -# 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@@" | ||
| -then | ||
| - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" | ||
| -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" | ||
| -then | ||
| - : no probing necessary | ||
| @@ -26,7 +26,7 @@ then | ||
| elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" | ||
| then | ||
| : no probing necessary | ||
| -elif type gettext.sh >/dev/null 2>&1 | ||
| -then | ||
| - # GNU libintl's gettext.sh | ||
| - GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu | ||
| -elif test "$(gettext -h 2>&1)" = "-h" | ||
| -then | ||
| - # gettext binary exists but no gettext.sh. likely to be a gettext | ||
| - # binary on a Solaris or something that is not GNU libintl and | ||
| - # lack eval_gettext. | ||
| - GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext | ||
| -fi | ||
| -export GIT_INTERNAL_GETTEXT_SH_SCHEME | ||
| - | ||
| -# ... and then follow that decision. | ||
| -case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in | ||
| -gnu) | ||
| - # Use libintl's gettext.sh, or fall back to English if we can't. | ||
| +elif type @gettext@/bin/gettext.sh >/dev/null 2>&1 | ||
| then | ||
| # GNU libintl's gettext.sh | ||
| GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu | ||
| @@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME | ||
| case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in | ||
| gnu) | ||
| # Use libintl's gettext.sh, or fall back to English if we can't. | ||
| - . gettext.sh | ||
| - ;; | ||
| -gettext_without_eval_gettext) | ||
| - # Solaris has a gettext(1) but no eval_gettext(1) | ||
| - eval_gettext () { | ||
| - gettext "$1" | ( | ||
| - export PATH $(git sh-i18n--envsubst --variables "$1"); | ||
| - git sh-i18n--envsubst "$1" | ||
| - ) | ||
| - } | ||
| - | ||
| - eval_ngettext () { | ||
| - ngettext "$1" "$2" "$3" | ( | ||
| - export PATH $(git sh-i18n--envsubst --variables "$2"); | ||
| - git sh-i18n--envsubst "$2" | ||
| - ) | ||
| - } | ||
| - ;; | ||
| -poison) | ||
| - # Emit garbage so that tests that incorrectly rely on translatable | ||
| - # strings will fail. | ||
| - gettext () { | ||
| - printf "%s" "# GETTEXT POISON #" | ||
| - } | ||
| - | ||
| - eval_gettext () { | ||
| - printf "%s" "# GETTEXT POISON #" | ||
| - } | ||
| - | ||
| - eval_ngettext () { | ||
| - printf "%s" "# GETTEXT POISON #" | ||
| - } | ||
| - ;; | ||
| -*) | ||
| - gettext () { | ||
| - printf "%s" "$1" | ||
| - } | ||
| - | ||
| - eval_gettext () { | ||
| - printf "%s" "$1" | ( | ||
| - export PATH $(git sh-i18n--envsubst --variables "$1"); | ||
| - git sh-i18n--envsubst "$1" | ||
| - ) | ||
| - } | ||
| +# GNU gettext | ||
| +export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu | ||
| +export PATH=@gettext@/bin:$PATH | ||
|
|
||
| - eval_ngettext () { | ||
| - (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | ( | ||
| - export PATH $(git sh-i18n--envsubst --variables "$2"); | ||
| - git sh-i18n--envsubst "$2" | ||
| - ) | ||
| - } | ||
| - ;; | ||
| -esac | ||
| +. @gettext@/bin/gettext.sh | ||
|
|
||
| # Git-specific wrapper functions | ||
| gettextln () { | ||
| + . @gettext@/bin/gettext.sh | ||
| + export PATH=@gettext@/bin:$PATH | ||
| ;; | ||
| gettext_without_eval_gettext) | ||
| # Solaris has a gettext(1) but no eval_gettext(1) |
7 changes: 4 additions & 3 deletions
7
pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| diff --git a/t/test-lib.sh b/t/test-lib.sh | ||
| index 8665b0a9b6..8bb892b1af 100644 | ||
| --- a/t/test-lib.sh | ||
| +++ b/t/test-lib.sh | ||
| @@ -923,7 +923,7 @@ | ||
| @@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED" | ||
| then | ||
| GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || | ||
| error "Cannot run git from $GIT_TEST_INSTALLED." | ||
| - PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH | ||
| - PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH | ||
| + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH | ||
| GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} | ||
| else # normal case, use ../bin-wrappers only unless $with_dashes: | ||
| git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" | ||
| if test -n "$no_bin_wrappers" |
10 changes: 5 additions & 5 deletions
10
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters