Skip to content

Commit

Permalink
git: 2.26.2 -> 2.27.0 (#89355)
Browse files Browse the repository at this point in the history
disable_test: Use \s instead of ' ' as tabs are used for indentation in
t5324-split-commit-graph.sh. It's also necessary to insert : (no op) in
front of # to prevent Bash syntax errors due to empty loops.

Two newly added tests fail due the usage of shared permissions (outside
of the build sandbox they succeed, actually even with breakpointHook
(cntr attach + cntr exec bash)):
```
t5324-split-commit-graph.sh                      (Wstat: 256 Tests: 29
Failed: 2)
  Failed tests:  28-29
  Non-zero exit status: 1
```

I'm also adding myself as maintainer since there currently doesn't seem
to be a fixed one for regular updates.

Announcement:
https://lkml.kernel.org/lkml/xmqqzh9mu4my.fsf@gitster.c.googlers.com/
  • Loading branch information
primeos committed Jun 6, 2020
1 parent 6ef54ad commit 98c44f5
Showing 1 changed file with 5 additions and 4 deletions.
Expand Up @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;

let
version = "2.26.2";
version = "2.27.0";
svn = subversionClient.override { perlBindings = perlSupport; };

gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
Expand All @@ -33,7 +33,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd";
sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk";
};

outputs = [ "out" "doc" ];
Expand Down Expand Up @@ -286,13 +286,14 @@ stdenv.mkDerivation {
mv t/{,skip-}$test.sh || true
else
sed -i t/$test.sh \
-e "/^ *test_expect_.*$pattern/,/^ *' *\$/{s/^/#/}"
-e "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}"
fi
}
# Shared permissions are forbidden in sandbox builds.
disable_test t0001-init shared
disable_test t1301-shared-repo
disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository'
# Our patched gettext never fallbacks
disable_test t0201-gettext-fallbacks
Expand Down Expand Up @@ -343,6 +344,6 @@ stdenv.mkDerivation {
'';

platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ];
maintainers = with stdenv.lib.maintainers; [ primeos peti wmertens globin ];
};
}

0 comments on commit 98c44f5

Please sign in to comment.