···

       
60
       
60
       
 
       
assert svnSupport -> perlSupport;

     

       
61
       
61
       
 
       


     

       
62
       
62
       
 
       
let

     

       
63
       
63
       
-
       
  version = "2.50.1";

     

       
63
       
63
       
+
       
  version = "2.51.0";

     

       
64
       
64
       
 
       
  svn = subversionClient.override { perlBindings = perlSupport; };

     

       
65
       
65
       
 
       
  gitwebPerlLibs = with perlPackages; [

     

       
66
       
66
       
 
       
    CGI

     
···

       
89
       
89
       
 
       
        }.tar.xz"

     

       
90
       
90
       
 
       
      else

     

       
91
       
91
       
 
       
        "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

     

       
92
       
92
       
-
       
    hash = "sha256-fj5sNt7L2PHu3RTULbZnS+A2ccIgSGS++ipBdWxcj8Q=";

     

       
92
       
92
       
+
       
    hash = "sha256-YKfCJRzC5YjVzYe65WcmBhfG3gwi3KnNv8TH0riZC2I=";

     

       
93
       
93
       
 
       
  };

     

       
94
       
94
       
 
       


     

       
95
       
95
       
 
       
  outputs = [ "out" ] ++ lib.optional withManual "doc";

     
···

       
301
       
301
       
 
       
    cp -a contrib $out/share/git/

     

       
302
       
302
       
 
       
    mkdir -p $out/share/bash-completion/completions

     

       
303
       
303
       
 
       
    ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/

     

       
304
       
304
       
-
       
    # only readme, developed in another repo

     

       
305
       
305
       
-
       
    rm -r contrib/hooks/multimail

     

       
306
       
306
       
-
       
    mkdir -p $out/share/git-core/contrib

     

       
307
       
307
       
-
       
    cp -a contrib/hooks/ $out/share/git-core/contrib/

     

       
308
       
308
       
-
       
    substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \

     

       
309
       
309
       
-
       
      --replace ' grep' ' ${gnugrep}/bin/grep' \

     

       
310
       
304
       
 
       


     

       
311
       
305
       
 
       
    # grep is a runtime dependency, need to patch so that it's found

     

       
312
       
306
       
 
       
    substituteInPlace $out/libexec/git-core/git-sh-setup \

     

···

       
1
       
1
       
 
       
diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc

     

       
2
       
2
       
-
       
index 7f223db42d..7e46a07d31 100644

     

       
2
       
2
       
+
       
index 5d13a856a7..5c9978c1e4 100644

     

       
3
       
3
       
 
       
--- a/Documentation/git-send-email.adoc

     

       
4
       
4
       
 
       
+++ b/Documentation/git-send-email.adoc

     

       
5
       
5
       
-
       
@@ -177,7 +177,7 @@ Sending

     

       
5
       
5
       
+
       
@@ -190,7 +190,7 @@ Sending

     

       
6
       
6
       
 
       
 	The command will be executed in the shell if necessary.  Default

     

       
7
       
7
       
 
       
 	is the value of `sendemail.sendmailCmd`.  If unspecified, and if

     

       
8
       
8
       
-
       
 	--smtp-server is also unspecified, git-send-email will search

     

       
9
       
9
       
-
       
-	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH.

     

       
10
       
10
       
-
       
+	for `sendmail` in $PATH.

     

       
8
       
8
       
+
       
 	`--smtp-server` is also unspecified, `git send-email` will search

     

       
9
       
9
       
+
       
-	for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH`.

     

       
10
       
10
       
+
       
+	for `sendmail` in `$PATH`.

     

       
11
       
11
       
 
       
 

     

       
12
       
12
       
 
       
 --smtp-encryption=<encryption>::

     

       
13
       
13
       
 
       
 	Specify in what way encrypting begins for the SMTP connection.

     

       
14
       
14
       
-
       
@@ -233,9 +233,9 @@ a password is obtained using 'git-credential'.

     

       
15
       
15
       
-
       
 --smtp-server=<host>::

     

       
14
       
14
       
+
       
@@ -247,7 +247,7 @@ a password is obtained using linkgit:git-credential[1].

     

       
16
       
15
       
 
       
 	If set, specifies the outgoing SMTP server to use (e.g.

     

       
17
       
16
       
 
       
 	`smtp.example.com` or a raw IP address).  If unspecified, and if

     

       
18
       
18
       
-
       
-	`--sendmail-cmd` is also unspecified, the default is to search

     

       
19
       
19
       
-
       
-	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a

     

       
20
       
20
       
-
       
-	program is available, falling back to `localhost` otherwise.

     

       
21
       
21
       
-
       
+	`--sendmail-cmd` is also unspecified, the default is to search for

     

       
22
       
22
       
-
       
+	`sendmail` in $PATH if such a program is available, falling back to

     

       
23
       
23
       
-
       
+	`localhost` otherwise.

     

       
17
       
17
       
+
       
 	`--sendmail-cmd` is also unspecified, the default is to search

     

       
18
       
18
       
+
       
-	for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH` if such a

     

       
19
       
19
       
+
       
+	for `sendmail` in `$PATH` if such a

     

       
20
       
20
       
+
       
 	program is available, falling back to `localhost` otherwise.

     

       
24
       
21
       
 
       
 +

     

       
25
       
22
       
 
       
 For backward compatibility, this option can also specify a full pathname

     

       
26
       
26
       
-
       
 of a sendmail-like program instead; the program must support the `-i`

     

       
27
       
23
       
 
       
diff --git a/git-send-email.perl b/git-send-email.perl

     

       
28
       
24
       
 
       
index 798d59b84f..69c9cc2a7d 100755

     

       
29
       
25
       
 
       
--- a/git-send-email.perl