From 45eff406554f3ff31bdf7d54daae1da5635db72e Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Sun, 8 Aug 2021 17:55:53 +0200 Subject: git: update to v2.33.0 Update to git version v2.33.0, no additional changes required. Signed-off-by: Christian Hesse --- Makefile | 2 +- git | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d13c5bd..b030ff9 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.32.0 +GIT_VER = 2.33.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/git b/git index ebf3c04..225bc32 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit ebf3c04b262aa27fbb97f8a0156c2347fecafafb +Subproject commit 225bc32a989d7a22fa6addafd4ce7dcd04675dbf -- cgit 1.4.1 From b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 3 Nov 2021 15:32:17 +0100 Subject: git: update to v2.34.0 Update to git version v2.34.0, this requires changes for these upstream commits: * abf897bacd2d36b9dbd07c70b4a2f97a084704ee string-list.[ch]: remove string_list_init() compatibility function Signed-off-by: Christian Hesse --- Makefile | 2 +- cgit.c | 2 +- git | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b030ff9..9153a39 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.33.0 +GIT_VER = 2.34.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/cgit.c b/cgit.c index 08d81a1..4b2d86c 100644 --- a/cgit.c +++ b/cgit.c @@ -428,7 +428,7 @@ static void prepare_context(void) ctx.page.modified = time(NULL); ctx.page.expires = ctx.page.modified; ctx.page.etag = NULL; - string_list_init(&ctx.cfg.mimetypes, 1); + string_list_init_dup(&ctx.cfg.mimetypes); if (ctx.env.script_name) ctx.cfg.script_name = xstrdup(ctx.env.script_name); if (ctx.env.query_string) diff --git a/git b/git index 225bc32..cd3e606 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 225bc32a989d7a22fa6addafd4ce7dcd04675dbf +Subproject commit cd3e606211bb1cf8bc57f7d76bab98cc17a150bc -- cgit 1.4.1 From 11be5b8182fc71c00c1c00c693f64c97769d77bb Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 24 Nov 2021 21:12:12 +0100 Subject: git: update to v2.34.1 Update to git version v2.34.1, no additional changes required. Signed-off-by: Christian Hesse --- Makefile | 2 +- git | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9153a39..baa7c2d 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.34.0 +GIT_VER = 2.34.1 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/git b/git index cd3e606..e9d7761 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit cd3e606211bb1cf8bc57f7d76bab98cc17a150bc +Subproject commit e9d7761bb94f20acc98824275e317fa82436c25d -- cgit 1.4.1 From 73e98c16e8c63f0061d2b7e792c3b7d0552c05a9 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 11 Jan 2022 11:03:29 +0100 Subject: git: update to v2.35.0 Update to git version v2.35.0, no additional changes required. Signed-off-by: Christian Hesse --- Makefile | 2 +- git | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index baa7c2d..e82e328 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.34.1 +GIT_VER = 2.35.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/git b/git index e9d7761..89bece5 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit e9d7761bb94f20acc98824275e317fa82436c25d +Subproject commit 89bece5c8c96f0b962cfc89e63f82d603fd60bed -- cgit 1.4.1 From bbbaa29a96fbeccad7e09702309251bef7905496 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Sat, 29 Jan 2022 10:20:25 +0100 Subject: git: update to v2.35.1 Update to git version v2.35.1, no additional changes required. Signed-off-by: Christian Hesse --- Makefile | 2 +- git | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e82e328..2d9198d 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.35.0 +GIT_VER = 2.35.1 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/git b/git index 89bece5..4c53a8c 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 89bece5c8c96f0b962cfc89e63f82d603fd60bed +Subproject commit 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a -- cgit 1.4.1