##// END OF EJS Templates
dependencies: bumped git to 2.22.0 release
marcink -
r724:60c231be default
parent child
Show More
@@ -2,10 +2,10 self: super: {
2
2
3 # bump GIT version
3 # bump GIT version
4 git = super.lib.overrideDerivation super.git (oldAttrs: {
4 git = super.lib.overrideDerivation super.git (oldAttrs: {
5 name = "git-2.19.2";
5 name = "git-2.22.0";
6 src = self.fetchurl {
6 src = self.fetchurl {
7 url = "https://www.kernel.org/pub/software/scm/git/git-2.19.2.tar.xz";
7 url = "https://www.kernel.org/pub/software/scm/git/git-2.22.0.tar.xz";
8 sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw";
8 sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm";
9 };
9 };
10
10
11 # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git
11 # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git
@@ -3,9 +3,10 and (2) make sure `gitman.info' isn't pr
3 node names).
3 node names).
4
4
5 diff --git a/Documentation/Makefile b/Documentation/Makefile
5 diff --git a/Documentation/Makefile b/Documentation/Makefile
6 index 26a2342bea..ceccd67ebb 100644
6 --- a/Documentation/Makefile
7 --- a/Documentation/Makefile
7 +++ b/Documentation/Makefile
8 +++ b/Documentation/Makefile
8 @@ -122,7 +122,7 @@
9 @@ -132,7 +132,7 @@ HTML_REPO = ../../git-htmldocs
9
10
10 MAKEINFO = makeinfo
11 MAKEINFO = makeinfo
11 INSTALL_INFO = install-info
12 INSTALL_INFO = install-info
@@ -14,7 +15,7 diff --git a/Documentation/Makefile b/Do
14 DBLATEX = dblatex
15 DBLATEX = dblatex
15 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
16 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
16 DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
17 DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
17 @@ -240,7 +240,7 @@
18 @@ -250,7 +250,7 @@ man1: $(DOC_MAN1)
18 man5: $(DOC_MAN5)
19 man5: $(DOC_MAN5)
19 man7: $(DOC_MAN7)
20 man7: $(DOC_MAN7)
20
21
@@ -23,7 +24,7 diff --git a/Documentation/Makefile b/Do
23
24
24 pdf: user-manual.pdf
25 pdf: user-manual.pdf
25
26
26 @@ -256,10 +256,9 @@
27 @@ -266,10 +266,9 @@ install-man: man
27
28
28 install-info: info
29 install-info: info
29 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
30 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
@@ -1,7 +1,8
1 diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
1 diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
2 index 1afe9fc858..05dd7c3a90 100644
2 --- a/Documentation/git-send-email.txt
3 --- a/Documentation/git-send-email.txt
3 +++ b/Documentation/git-send-email.txt
4 +++ b/Documentation/git-send-email.txt
4 @@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
5 @@ -215,8 +215,7 @@ a password is obtained using 'git-credential'.
5 specify a full pathname of a sendmail-like program instead;
6 specify a full pathname of a sendmail-like program instead;
6 the program must support the `-i` option. Default value can
7 the program must support the `-i` option. Default value can
7 be specified by the `sendemail.smtpServer` configuration
8 be specified by the `sendemail.smtpServer` configuration
@@ -12,9 +13,10 diff --git a/Documentation/git-send-emai
12
13
13 --smtp-server-port=<port>::
14 --smtp-server-port=<port>::
14 diff --git a/git-send-email.perl b/git-send-email.perl
15 diff --git a/git-send-email.perl b/git-send-email.perl
16 index 8eb63b5a2f..74a61d8213 100755
15 --- a/git-send-email.perl
17 --- a/git-send-email.perl
16 +++ b/git-send-email.perl
18 +++ b/git-send-email.perl
17 @@ -944,8 +944,7 @@ if (defined $reply_to) {
19 @@ -956,8 +956,7 @@ sub expand_one_alias {
18 }
20 }
19
21
20 if (!defined $smtp_server) {
22 if (!defined $smtp_server) {
@@ -1,94 +1,23
1 diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
2 index e1d917fd27..e90f8e1414 100644
1 --- a/git-sh-i18n.sh
3 --- a/git-sh-i18n.sh
2 +++ b/git-sh-i18n.sh
4 +++ b/git-sh-i18n.sh
3 @@ -15,87 +15,11 @@
5 @@ -26,7 +26,7 @@ then
4 fi
6 elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
5 export TEXTDOMAINDIR
7 then
6
8 : no probing necessary
7 -# First decide what scheme to use...
8 -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
9 -if test -n "$GIT_GETTEXT_POISON"
10 -then
11 - GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
12 -elif test -n "@@USE_GETTEXT_SCHEME@@"
13 -then
14 - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
15 -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
16 -then
17 - : no probing necessary
18 -elif type gettext.sh >/dev/null 2>&1
9 -elif type gettext.sh >/dev/null 2>&1
19 -then
10 +elif type @gettext@/bin/gettext.sh >/dev/null 2>&1
20 - # GNU libintl's gettext.sh
11 then
21 - GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
12 # GNU libintl's gettext.sh
22 -elif test "$(gettext -h 2>&1)" = "-h"
13 GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
23 -then
14 @@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME
24 - # gettext binary exists but no gettext.sh. likely to be a gettext
15 case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
25 - # binary on a Solaris or something that is not GNU libintl and
16 gnu)
26 - # lack eval_gettext.
17 # Use libintl's gettext.sh, or fall back to English if we can't.
27 - GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
28 -fi
29 -export GIT_INTERNAL_GETTEXT_SH_SCHEME
30 -
31 -# ... and then follow that decision.
32 -case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
33 -gnu)
34 - # Use libintl's gettext.sh, or fall back to English if we can't.
35 - . gettext.sh
18 - . gettext.sh
36 - ;;
19 + . @gettext@/bin/gettext.sh
37 -gettext_without_eval_gettext)
20 + export PATH=@gettext@/bin:$PATH
38 - # Solaris has a gettext(1) but no eval_gettext(1)
21 ;;
39 - eval_gettext () {
22 gettext_without_eval_gettext)
40 - gettext "$1" | (
23 # Solaris has a gettext(1) but no eval_gettext(1)
41 - export PATH $(git sh-i18n--envsubst --variables "$1");
42 - git sh-i18n--envsubst "$1"
43 - )
44 - }
45 -
46 - eval_ngettext () {
47 - ngettext "$1" "$2" "$3" | (
48 - export PATH $(git sh-i18n--envsubst --variables "$2");
49 - git sh-i18n--envsubst "$2"
50 - )
51 - }
52 - ;;
53 -poison)
54 - # Emit garbage so that tests that incorrectly rely on translatable
55 - # strings will fail.
56 - gettext () {
57 - printf "%s" "# GETTEXT POISON #"
58 - }
59 -
60 - eval_gettext () {
61 - printf "%s" "# GETTEXT POISON #"
62 - }
63 -
64 - eval_ngettext () {
65 - printf "%s" "# GETTEXT POISON #"
66 - }
67 - ;;
68 -*)
69 - gettext () {
70 - printf "%s" "$1"
71 - }
72 -
73 - eval_gettext () {
74 - printf "%s" "$1" | (
75 - export PATH $(git sh-i18n--envsubst --variables "$1");
76 - git sh-i18n--envsubst "$1"
77 - )
78 - }
79 +# GNU gettext
80 +export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
81 +export PATH=@gettext@/bin:$PATH
82
83 - eval_ngettext () {
84 - (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
85 - export PATH $(git sh-i18n--envsubst --variables "$2");
86 - git sh-i18n--envsubst "$2"
87 - )
88 - }
89 - ;;
90 -esac
91 +. @gettext@/bin/gettext.sh
92
93 # Git-specific wrapper functions
94 gettextln () {
@@ -1,12 +1,13
1 diff --git a/t/test-lib.sh b/t/test-lib.sh
1 diff --git a/t/test-lib.sh b/t/test-lib.sh
2 index 8665b0a9b6..8bb892b1af 100644
2 --- a/t/test-lib.sh
3 --- a/t/test-lib.sh
3 +++ b/t/test-lib.sh
4 +++ b/t/test-lib.sh
4 @@ -923,7 +923,7 @@
5 @@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED"
5 then
6 then
6 GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
7 GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
7 error "Cannot run git from $GIT_TEST_INSTALLED."
8 error "Cannot run git from $GIT_TEST_INSTALLED."
8 - PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
9 - PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH
9 + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
10 + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
10 GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
11 GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
11 else # normal case, use ../bin-wrappers only unless $with_dashes:
12 else # normal case, use ../bin-wrappers only unless $with_dashes:
12 git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
13 if test -n "$no_bin_wrappers"
@@ -1,8 +1,8
1 diff --git a/connect.c b/connect.c
1 diff --git a/connect.c b/connect.c
2 index c3a014c5b..fbca3262b 100644
2 index 4813f005ab..b3f12f3268 100644
3 --- a/connect.c
3 --- a/connect.c
4 +++ b/connect.c
4 +++ b/connect.c
5 @@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
5 @@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
6
6
7 ssh = getenv("GIT_SSH");
7 ssh = getenv("GIT_SSH");
8 if (!ssh)
8 if (!ssh)
@@ -12,7 +12,7 index c3a014c5b..fbca3262b 100644
12 }
12 }
13
13
14 diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
14 diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
15 index 480a6b30d..781720424 100644
15 index 480a6b30d0..7817204241 100644
16 --- a/git-gui/lib/remote_add.tcl
16 --- a/git-gui/lib/remote_add.tcl
17 +++ b/git-gui/lib/remote_add.tcl
17 +++ b/git-gui/lib/remote_add.tcl
18 @@ -139,7 +139,7 @@ method _add {} {
18 @@ -139,7 +139,7 @@ method _add {} {
General Comments 0
You need to be logged in to leave comments. Login now