diff options
| author | sterni <sternenseemann@systemli.org> | 2022-05-04T15·56+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-05-04T16·18+0000 |
| commit | fbbee5584b2fcc39c67b8c638cf991720f480235 (patch) | |
| tree | a3f87f67831f0aecff80b862262fd07a0661c90e /third_party | |
| parent | 5fae8b08266a4fd7f24ed3eddc914e61a45cee9a (diff) | |
subtree(3p/cgit): update for git 2.36.0 support r/4004
Merge commit '51596ba1c25ff0dbba894153015203b4f1d3947b' into canon Change-Id: Iaaf7a849d111aebc6bf85cec118439ba1d49f1e3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5521 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/cgit/Makefile | 2 | ||||
| -rw-r--r-- | third_party/cgit/default.nix | 1 | ||||
| -rw-r--r-- | third_party/cgit/ui-log.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/third_party/cgit/Makefile b/third_party/cgit/Makefile index 9153a393f7..2509d21775 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.34.0 +GIT_VER = 2.36.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/default.nix b/third_party/cgit/default.nix index e07bebee86..55aaa02f32 100644 --- a/third_party/cgit/default.nix +++ b/third_party/cgit/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ bjornfor ]; - ci.skip = true; # needs subtree update to work with git 2.36 }; } diff --git a/third_party/cgit/ui-log.c b/third_party/cgit/ui-log.c index 20774bf82f..565929f3f0 100644 --- a/third_party/cgit/ui-log.c +++ b/third_party/cgit/ui-log.c @@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) "", &revs->diffopt); diffcore_std(&revs->diffopt); - found = !diff_queue_is_empty(); + found = !diff_queue_is_empty(&revs->diffopt); saved_fmt = revs->diffopt.output_format; revs->diffopt.output_format = DIFF_FORMAT_CALLBACK; revs->diffopt.format_callback = cgit_diff_tree_cb; |