Processed: Re: Bug#980576: mercurial: autopkgtest needs update for new version of git
Processing control commands: > tag -1 upstream fixed-upstream patch Bug #980576 [src:mercurial] mercurial: autopkgtest needs update for new version of git Added tag(s) fixed-upstream, patch, and upstream. -- 980576: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980576 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#980576: mercurial: autopkgtest needs update for new version of git
Control: tag -1 upstream fixed-upstream patch On Mon, Feb 01, 2021 at 05:42:04PM +0100, Julien Cristau wrote: > On Mon, Feb 01, 2021 at 08:14:13AM -0800, Steve Langasek wrote: > > Package: mercurial > > Version: 5.6.1-1 > > Followup-For: Bug #980576 > > User: ubuntu-de...@lists.ubuntu.com > > Usertags: origin-ubuntu hirsute ubuntu-patch > > > > Dear maintainers, > > > > Attached is a patch that makes the mercurial test suite compatible with both > > the old and new git behavior. It has been uploaded to Ubuntu. Please > > consider applying in Debian as well. > > > Hi Steve, > > is this actually still an issue? > https://www.mercurial-scm.org/repo/hg/rev/366c547a8a57 is in 5.6 and > should address this, as far as I can tell. > Nevermind, I see https://www.mercurial-scm.org/repo/hg/rev/88dfe1c279bb is also needed and is not in the release, so I'll cherry-pick that. Cheers, Julien
Bug#980576: mercurial: autopkgtest needs update for new version of git
On Mon, Feb 01, 2021 at 08:14:13AM -0800, Steve Langasek wrote: > Package: mercurial > Version: 5.6.1-1 > Followup-For: Bug #980576 > User: ubuntu-de...@lists.ubuntu.com > Usertags: origin-ubuntu hirsute ubuntu-patch > > Dear maintainers, > > Attached is a patch that makes the mercurial test suite compatible with both > the old and new git behavior. It has been uploaded to Ubuntu. Please > consider applying in Debian as well. > Hi Steve, is this actually still an issue? https://www.mercurial-scm.org/repo/hg/rev/366c547a8a57 is in 5.6 and should address this, as far as I can tell. Thanks, Julien > diff -Nru mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch > mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch > --- mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch > 1969-12-31 16:00:00.0 -0800 > +++ mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch > 2021-01-30 17:04:28.0 -0800 > @@ -0,0 +1,33 @@ > +Description: make test cases compatible with git 2.30.0 > + New git upstream includes an additional warning when calling 'git init' > + if you do not first set init.defaultBranch in your config. Make the test > + case compatible with both old and new git by setting init.defaultBranch > + before calling git init. > +Author: Steve Langasek > +Last-Update: 2021-01-30 > +Bug-Debian: https://bugs.debian.org/980576 > + > +Index: mercurial-5.6.1/tests/test-convert-git.t > +=== > +--- mercurial-5.6.1.orig/tests/test-convert-git.t > mercurial-5.6.1/tests/test-convert-git.t > +@@ -677,6 +677,7 @@ > + > + $ mkdir git-testrevs > + $ cd git-testrevs > ++ $ git config --global init.defaultBranch master > + $ git init > + Initialized empty Git repository in $TESTTMP/git-testrevs/.git/ > + $ echo a >> a ; git add a > /dev/null; git commit -m 'first' > /dev/null > +Index: mercurial-5.6.1/tests/test-subrepo-git.t > +=== > +--- mercurial-5.6.1.orig/tests/test-subrepo-git.t > mercurial-5.6.1/tests/test-subrepo-git.t > +@@ -1199,6 +1199,7 @@ > + $ hg init malicious-subrepository > + $ cd malicious-subrepository > + $ echo "s = [git]ext::sh -c echo% pwned:% \$PWNED_MSG% >pwned.txt" > > .hgsub > ++ $ git config --global init.defaultBranch master > + $ git init s > + Initialized empty Git repository in > $TESTTMP/tc/malicious-subrepository/s/.git/ > + $ cd s > diff -Nru mercurial-5.6.1/debian/patches/series > mercurial-5.6.1/debian/patches/series > --- mercurial-5.6.1/debian/patches/series 2021-01-08 07:02:06.0 > -0800 > +++ mercurial-5.6.1/debian/patches/series 2021-01-30 14:48:59.0 > -0800 > @@ -3,3 +3,4 @@ > deb_specific__optional-dependencies > deb_specific__disable_libdir_replacement.patch > 0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch > +git-2.30.0-test-compat.patch
Bug#980576: mercurial: autopkgtest needs update for new version of git
Package: mercurial Version: 5.6.1-1 Followup-For: Bug #980576 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu hirsute ubuntu-patch Dear maintainers, Attached is a patch that makes the mercurial test suite compatible with both the old and new git behavior. It has been uploaded to Ubuntu. Please consider applying in Debian as well. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org diff -Nru mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch --- mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch 1969-12-31 16:00:00.0 -0800 +++ mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch 2021-01-30 17:04:28.0 -0800 @@ -0,0 +1,33 @@ +Description: make test cases compatible with git 2.30.0 + New git upstream includes an additional warning when calling 'git init' + if you do not first set init.defaultBranch in your config. Make the test + case compatible with both old and new git by setting init.defaultBranch + before calling git init. +Author: Steve Langasek +Last-Update: 2021-01-30 +Bug-Debian: https://bugs.debian.org/980576 + +Index: mercurial-5.6.1/tests/test-convert-git.t +=== +--- mercurial-5.6.1.orig/tests/test-convert-git.t mercurial-5.6.1/tests/test-convert-git.t +@@ -677,6 +677,7 @@ + + $ mkdir git-testrevs + $ cd git-testrevs ++ $ git config --global init.defaultBranch master + $ git init + Initialized empty Git repository in $TESTTMP/git-testrevs/.git/ + $ echo a >> a ; git add a > /dev/null; git commit -m 'first' > /dev/null +Index: mercurial-5.6.1/tests/test-subrepo-git.t +=== +--- mercurial-5.6.1.orig/tests/test-subrepo-git.t mercurial-5.6.1/tests/test-subrepo-git.t +@@ -1199,6 +1199,7 @@ + $ hg init malicious-subrepository + $ cd malicious-subrepository + $ echo "s = [git]ext::sh -c echo% pwned:% \$PWNED_MSG% >pwned.txt" > .hgsub ++ $ git config --global init.defaultBranch master + $ git init s + Initialized empty Git repository in $TESTTMP/tc/malicious-subrepository/s/.git/ + $ cd s diff -Nru mercurial-5.6.1/debian/patches/series mercurial-5.6.1/debian/patches/series --- mercurial-5.6.1/debian/patches/series 2021-01-08 07:02:06.0 -0800 +++ mercurial-5.6.1/debian/patches/series 2021-01-30 14:48:59.0 -0800 @@ -3,3 +3,4 @@ deb_specific__optional-dependencies deb_specific__disable_libdir_replacement.patch 0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch +git-2.30.0-test-compat.patch
Bug#980576: mercurial: autopkgtest needs update for new version of git
Source: mercurial Version: 5.5.2-1 Severity: serious X-Debbugs-CC: debian...@lists.debian.org, g...@packages.debian.org Tags: sid bullseye User: debian...@lists.debian.org Usertags: needs-update Control: affects -1 src:git Dear maintainer(s), With a recent upload of git the autopkgtest of mercurial fails in testing when that autopkgtest is run with the binary packages of git from unstable. It passes when run with only packages from testing. In tabular form: passfail gitfrom testing1:2.30.0-1 mercurial from testing5.5.2-1 all others from testingfrom testing I copied some of the output at the bottom of this report. Currently this regression is blocking the migration of git to testing [1]. Of course, git shouldn't just break your autopkgtest (or even worse, your package), but it seems to me that the change in git was intended and your package needs to update to the new situation. If this is a real problem in your package (and not only in your autopkgtest), the right binary package(s) from git should really add a versioned Breaks on the unfixed version of (one of your) package(s). Note: the Breaks is nice even if the issue is only in the autopkgtest as it helps the migration software to figure out the right versions to combine in the tests. More information about this bug and the reason for filing it can be found on https://wiki.debian.org/ContinuousIntegration/RegressionEmailInformation Paul [1] https://qa.debian.org/excuses.php?package=git https://ci.debian.net/data/autopkgtest/testing/amd64/m/mercurial/9857175/log.gz est-http-permissions.t test-http-permissions.t ... # Test test-http-permissions.t # Running sh "/tmp/hgtests.k6wnhqr_/child113/test-http-permissions.t.sh" --- /tmp/autopkgtest-lxc.k1drd64q/downtmp/build.mL2/src/tests/test-convert-git.t +++ /tmp/autopkgtest-lxc.k1drd64q/downtmp/build.mL2/src/tests/test-convert-git.t.err @@ -680,6 +680,16 @@ $ mkdir git-testrevs $ cd git-testrevs $ git init + hint: Using 'master' as the name for the initial branch. This default branch name + hint: is subject to change. To configure the initial branch name to use in all + hint: of your new repositories, which will suppress this warning, call: + hint: + hint:git config --global init.defaultBranch + hint: + hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and + hint: 'development'. The just-created branch can be renamed via this command: + hint: + hint:git branch -m Initialized empty Git repository in $TESTTMP/git-testrevs/.git/ $ echo a >> a ; git add a > /dev/null; git commit -m 'first' > /dev/null $ echo a >> a ; git add a > /dev/null; git commit -m 'master commit' > /dev/null @@ -882,6 +892,16 @@ convert using a different remote prefix $ git init git-repo7 + hint: Using 'master' as the name for the initial branch. This default branch name + hint: is subject to change. To configure the initial branch name to use in all + hint: of your new repositories, which will suppress this warning, call: + hint: + hint:git config --global init.defaultBranch + hint: + hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and + hint: 'development'. The just-created branch can be renamed via this command: + hint: + hint:git branch -m Initialized empty Git repository in $TESTTMP/git-repo7/.git/ $ cd git-repo7 TODO: it'd be nice to use (?) lines instead of grep -v to handle the @@ -957,6 +977,16 @@ test for escaping the repo name (CVE-2016-3069) $ git init '`echo pwned >COMMAND-INJECTION`' + hint: Using 'master' as the name for the initial branch. This default branch name + hint: is subject to change. To configure the initial branch name to use in all + hint: of your new repositories, which will suppress this warning, call: + hint: + hint:git config --global init.defaultBranch + hint: + hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and + hint: 'development'. The just-created branch can be renamed via this command: + hint: + hint:git branch -m Initialized empty Git repository in $TESTTMP/`echo pwned >COMMAND-INJECTION`/.git/ $ cd '`echo pwned >COMMAND-INJECTION`' $ git commit -q --allow-empty -m 'empty' @@ -974,6 +1004,16 @@ test for safely passing paths to git (CVE-2016-3105) $ git init 'ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #' + hint: Using 'master' as the name for the initial branch. This default branch name + hint: is subject to change. To configure the initial branch name to use in all + hint: of your new repositories, which will suppress this warning, call: + hint: + hint:git config --global init.defaultBranch + hint: + hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and + hint: 'development'. The just-created branch can be renamed via this command: + hint: + hint:git branch -m
