git: update to v2.11.0

Update to git version v2.11.0. Function write_archive()
dropped argument (int setup_prefix).

diff --git a/Makefile b/Makefile
index 1ab29059f96c33727c9767b2d55b6550c12b1e82..fe6cc982597f82a4f3c35196cd3f1950f87cb006 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.10.2
+GIT_VER = 2.11.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r

diff --git a/git b/git
index ac84098b7e32406a982ac01cc76a663d5605224b..454cb6bd52a4de614a3633e4f547af03d5c3b640 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit ac84098b7e32406a982ac01cc76a663d5605224b
+Subproject commit 454cb6bd52a4de614a3633e4f547af03d5c3b640

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 08c6e80550e1147d920611f1c29c9ad1c882ce7d..9b8cddd4c6b96cac7c8ea50f366d666e5502ec6e 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
        /* argv_array guarantees a trailing NULL entry. */
        memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
-       result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
+       result = write_archive(argv.argc, nargv, NULL, NULL, 0);
        argv_array_clear(&argv);
        free(nargv);
        return result;