aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-11-30 10:43:08 +0100
committerChristian Hesse <mail@eworm.de>2016-11-30 10:43:08 +0100
commit91153fd02e62f2eaca8e6c140baa4f2abf39c40e (patch)
tree6f132121243ba2e5702364be71f9572004bbb5fb
parent2b993402c7ed5849606a5bf4d3c7cb212f491b06 (diff)
git: update to v2.11.0ch/git-2-11-0ch/for-jason
Update to git version v2.11.0. Function write_archive() dropped argument (int setup_prefix).
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-snapshot.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1ab2905..fe6cc98 100644
--- 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
-Subproject ac84098b7e32406a982ac01cc76a663d5605224
+Subproject 454cb6bd52a4de614a3633e4f547af03d5c3b64
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 08c6e80..9b8cddd 100644
--- 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;