mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

subtree(3p/cgit): update for git 2.36.0 support

Browse source 
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>
This commit is contained in:
sterni 2022-05-04 17:56:50 +02:00 committed by clbot
parent 5fae8b0826
commit fbbee5584b
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ops/nixos.nix
View file

@ -51,5 +51,5 @@ in rec {
# Systems that should be built in CI # Systems that should be built in CI
whitbySystem = (nixosFor depot.ops.machines.whitby).system; whitbySystem = (nixosFor depot.ops.machines.whitby).system;
sandunySystem = (nixosFor depot.ops.machines.sanduny).system; sandunySystem = (nixosFor depot.ops.machines.sanduny).system;
meta.ci.targets = [ "sandunySystem" /* "whitbySystem" */ ]; meta.ci.targets = [ "sandunySystem" "whitbySystem" ];
} }

2
third_party/cgit/Makefile vendored
View file

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> 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 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install INSTALL = install
COPYTREE = cp -r COPYTREE = cp -r

1
third_party/cgit/default.nix vendored
View file

@ -40,6 +40,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ bjornfor ]; maintainers = with lib.maintainers; [ bjornfor ];
ci.skip = true; # needs subtree update to work with git 2.36
}; };
} }

2
third_party/cgit/ui-log.c vendored
View file

@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
"", &revs->diffopt); "", &revs->diffopt);
diffcore_std(&revs->diffopt); diffcore_std(&revs->diffopt);
found = !diff_queue_is_empty(); found = !diff_queue_is_empty(&revs->diffopt);
saved_fmt = revs->diffopt.output_format; saved_fmt = revs->diffopt.output_format;
revs->diffopt.output_format = DIFF_FORMAT_CALLBACK; revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
revs->diffopt.format_callback = cgit_diff_tree_cb; revs->diffopt.format_callback = cgit_diff_tree_cb;