diff options
author | Christian Hesse | 2016-11-30 10:43:08 +0100 |
---|---|---|
committer | Christian Hesse | 2016-11-30 10:43:08 +0100 |
commit | 91153fd02e62f2eaca8e6c140baa4f2abf39c40e (patch) | |
tree | 6f132121243ba2e5702364be71f9572004bbb5fb | |
parent | Link with -ldl on GNU Hurd (diff) | |
download | cgit-91153fd02e62f2eaca8e6c140baa4f2abf39c40e.tar.gz cgit-91153fd02e62f2eaca8e6c140baa4f2abf39c40e.zip |
git: update to v2.11.0
Update to git version v2.11.0. Function write_archive() dropped argument (int setup_prefix).
-rw-r--r-- | Makefile | 2 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | ui-snapshot.c | 2 |
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) | |||
14 | pdfdir = $(docdir) | 14 | pdfdir = $(docdir) |
15 | mandir = $(prefix)/share/man | 15 | mandir = $(prefix)/share/man |
16 | SHA1_HEADER = <openssl/sha.h> | 16 | SHA1_HEADER = <openssl/sha.h> |
17 | GIT_VER = 2.10.2 | 17 | GIT_VER = 2.11.0 |
18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz | 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz |
19 | INSTALL = install | 19 | INSTALL = install |
20 | COPYTREE = cp -r | 20 | 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 | |||
37 | /* argv_array guarantees a trailing NULL entry. */ | 37 | /* argv_array guarantees a trailing NULL entry. */ |
38 | memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); | 38 | memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); |
39 | 39 | ||
40 | result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0); | 40 | result = write_archive(argv.argc, nargv, NULL, NULL, 0); |
41 | argv_array_clear(&argv); | 41 | argv_array_clear(&argv); |
42 | free(nargv); | 42 | free(nargv); |
43 | return result; | 43 | return result; |