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.000000000 -0800 > +++ mercurial-5.6.1/debian/patches/git-2.30.0-test-compat.patch > 2021-01-30 17:04:28.000000000 -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 <steve.langa...@ubuntu.com> > +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.000000000 > -0800 > +++ mercurial-5.6.1/debian/patches/series 2021-01-30 14:48:59.000000000 > -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
