diff options
| author | sterni <sternenseemann@systemli.org> | 2021-12-07T09·02+0100 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-12-07T10·36+0000 |
| commit | 6ef5162a93dc207fb7bd158f9d7449573d05045d (patch) | |
| tree | a1991ce63c1889fb1f10abf9a1904bd741d1c6b5 /third_party/cgit | |
| parent | 7f2f5d07f25a77ba8224543339b78bc78495fe44 (diff) | |
chore(3p): bump NixOS channels and emacs overlay to 2021-12-07 r/3147
* //third_party/cgit: apply patch [1] for Git 2.34 compatibility to reflect dropping of the string_list_init function in 770fed [2]. Patch hasn't been applied on cgit's master yet, over concern about a breaking change in git (?) [3]. [1]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004666.html [2]: https://github.com/git/git/commit/770fedaf9fb156bd8c18da41770eac0cb63fba63 [3]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004667.html Change-Id: Ie10c99c017ae5a43f4369b42151e19ecf07f7949
Diffstat (limited to 'third_party/cgit')
| -rw-r--r-- | third_party/cgit/Makefile | 2 | ||||
| -rw-r--r-- | third_party/cgit/cgit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/cgit/Makefile b/third_party/cgit/Makefile index d13c5bd13a..9153a393f7 100644 --- a/third_party/cgit/Makefile +++ b/third_party/cgit/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.32.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/third_party/cgit/cgit.c b/third_party/cgit/cgit.c index 08d81a1d4b..4b2d86c881 100644 --- a/third_party/cgit/cgit.c +++ b/third_party/cgit/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) |