equal
deleted
inserted
replaced
|
1 On Solaris, GnuPG's main executable is "gpg2" instead of "gpg". Perhaps |
|
2 that should be otherwise, but until we deliver a "gpg" executable, git |
|
3 should look for "gpg2" instead. This is not suitable for upstream. |
|
4 |
|
5 --- git-2.6.1/gpg-interface.c Fri Oct 2 15:40:47 2015 |
|
6 +++ git-2.6.1/gpg-interface.c Fri Dec 4 14:12:20 2015 |
|
7 @@ -5,7 +5,7 @@ |
|
8 #include "sigchain.h" |
|
9 |
|
10 static char *configured_signing_key; |
|
11 -static const char *gpg_program = "gpg"; |
|
12 +static const char *gpg_program = "gpg2"; |
|
13 |
|
14 #define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----" |
|
15 #define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----" |