Even after the fix from https://bugs.debian.org/1102106, git ftbfs on
s390x. Filing as a separate bug because this is a different failure.
From [1]:
| expecting success of 4014.200 '-c format.mboxrd format-patch':
| sp=" " &&
| cat >msg <<-INPUT_END &&
| mboxrd should escape the body
|
| From could trip up a loose mbox parser
| >From extra escape for reversibility
| >>From extra escape for reversibility 2
| from lower case not escaped
| Fromm bad speling not escaped
| From with leading space not escaped
|
| F
| From
| From$sp
| From $sp
| From $sp
| INPUT_END
|
| cat >expect <<-INPUT_END &&
| >From could trip up a loose mbox parser
| >>From extra escape for reversibility
| >>>From extra escape for reversibility 2
| from lower case not escaped
| Fromm bad speling not escaped
| From with leading space not escaped
|
| F
| From
| From
| From
| From
| INPUT_END
|
| C=$(git commit-tree HEAD^^{tree} -p HEAD <msg) &&
| git -c format.mboxrd format-patch --stdout -1 $C~1..$C >patch &&
| git format-patch --pretty=mboxrd --stdout -1 $C~1..$C >compat &&
| test_cmp patch compat &&
| git grep -h --no-index -A11 \
| "^>From could trip up a loose mbox parser" patch >actual &&
| test_cmp expect actual
|
| --- expect 2025-05-29 16:44:17.156655735 +0000
| +++ actual 2025-05-29 16:44:17.164655735 +0000
| @@ -1,12 +1 @@
| >From could trip up a loose mbox parser
| ->>From extra escape for reversibility
| ->>>From extra escape for reversibility 2
| -from lower case not escaped
| -Fromm bad speling not escaped
| - From with leading space not escaped
| -
| -F
| -From
| -From
| -From
| -From
| not ok 200 - -c format.mboxrd format-patch
[1] https://buildd.debian.org/status/fetch.php?pkg=git&arch=s390x&ver=1%3A2.49.0-2&stamp=1748537058&raw=0
control: tags -1 patch The patch you took was the top-most in the fix series, you also need the few that were applied before that one. That last one depends on the previous changes. I took me a while to figure that out. I collected them and verified that the package builds on amd64 and s390x. I can perform an NMU if you want. Sebastian
Hi Sebastian, Sebastian Andrzej Siewior wrote: Interesting! Part of what is surprising to me is that the test failure is different (mailsplit instead of min-batch-size) - I'm also not seeing where in the proposed patches would affect this functionality, as opposed to improving the code style (though improving the code style is also of course nice :)). Do you have a link to the log from when you built on s390x? Was it running tests? The other thing that surprised me was that experimental, which includes all patches in "next", also continued to fail tests on 64-bit big endian architectures, though now that I check again in the experimental buildd logs that is yet another, different failure! From [1]: | expecting success of 0001.37 'bare & --separate-git-dir incompatible within worktree': | test_when_finished "rm -rf bare.git linkwt seprepo" && | test_commit gumby && | git clone --bare . bare.git && | git -C bare.git worktree add --detach ../linkwt && | test_must_fail git -C linkwt init --separate-git-dir seprepo 2>err && | test_grep "incompatible" err | | BUG: read-cache.c:338: unsupported ce_mode: 24440200000 | Aborted | not ok 37 - bare & --separate-git-dir incompatible within worktree Looking closer. Thanks, Jonathan [1] https://buildd.debian.org/status/fetch.php?pkg=git&arch=s390x&ver=1%3A2.50.0%7Erc0%2Bnext.20250528-1&stamp=1748537212&raw=0
Jonathan Nieder wrote:
Reproduced on zelenka using unpatched upstream source:
On v2.50.0-rc1-743-g996102cc4f (current "next"):
make
cd t
./t0001-init.sh -v -i
fails with
BUG: read-cache.c:338: unsupported ce_mode: 24440200000
Aborted
not ok 37 - bare & --separate-git-dir incompatible within worktree
On v2.50.0-rc1-77-g83cb7ae638 (current "main") the result is the same.
On v2.49.0-9-gd50a5e8939 ("maint") the test passes.
./t4014-format-patch.sh passes there as well. Curious.
Hi Jonathan, I rebuilt the whole package so all tests were running https://breakpoint.cc/log-uns-patched.txt This is https://lore.kernel.org/git/20250606165718.HOiC2U4X@breakpoint.cc Sebastian
Sebastian Andrzej Siewior wrote: Okay, that indeed leans toward my having made a mistake while backporting. Thanks, I'll take the whole series instead like you've suggested. New uploads coming later today. :) For the future: in general if you prepare a "git format-patch" format patch or merge request in Salsa against the packaging repo, that tends to be very welcome, since it makes it easier to use your work as-is. I'd also be happy if you'd like to join as a co-maintainer (and we can use the packaging repo as our shared space for working). Sincerely, Jonathan
I don't want to rush or anything but… If you want me to prepare an unblock request before the upload happens or so, just say so ;) merge requests in Salsa? I wasn't aware that the git package is there. The package points only to git.or.cz. If you are all alone and would like some support I could try to join. I usually manage to keep myself busy :) Sebastian
We believe that the bug you reported is fixed in the latest version of
git, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1106786@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonathan Nieder <jrnieder@gmail.com> (supplier of updated git package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Sun, 08 Jun 2025 17:57:55 +0200
Source: git
Architecture: source
Version: 1:2.49.0-3
Distribution: unstable
Urgency: medium
Maintainer: Jonathan Nieder <jrnieder@gmail.com>
Changed-By: Jonathan Nieder <jrnieder@gmail.com>
Closes: 1106786
Changes:
git (1:2.49.0-3) unstable; urgency=medium
.
* debian/patches/0001..0007: apply the rest of the
parse-options fix from upstream; in particular, this avoids
size mismatches that on big-endian 64-bit platforms was
causing commands like "git grep -A" to write their argument
to the 32 bits after the variable that is used (thx
Sebastian Andrzej Siewior; closes: #1106786).
Checksums-Sha1:
198253a34b0f8616020ae602a6881620a3f3915a 2697 git_2.49.0-3.dsc
18093dde9e61c15fa27aae89fdb3b3e5f83950cf 819848 git_2.49.0-3.debian.tar.xz
23f9708b38449335b631e8c0ec701dee3b98dad2 12547 git_2.49.0-3_amd64.buildinfo
Checksums-Sha256:
d448f6c877e6212a0563ef4e5c483518fcd1119cd3c86905382bf12001b4aa91 2697 git_2.49.0-3.dsc
29f36fc71d0d061bd4fe96d16224727a5e5d966caa4f239fc8bdf87d35afca19 819848 git_2.49.0-3.debian.tar.xz
783a3af32ee3da342c5169e4cee35db3940c68d34738f14b3210c8d86247e3ee 12547 git_2.49.0-3_amd64.buildinfo
Files:
0de7cb43ba7d982edfa75d0dc2933ba7 2697 vcs optional git_2.49.0-3.dsc
9ab949fa70ed4b9608fc35db1ec27062 819848 vcs optional git_2.49.0-3.debian.tar.xz
ab12dd1b697e05a3793019cb115d6e36 12547 vcs optional git_2.49.0-3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJHBAEBCgAxFiEEUh5Y8X6W1xKqD/EC38Zx7rMz+iUFAmhQzSETHGpybmllZGVy
QGdtYWlsLmNvbQAKCRDfxnHuszP6JSFED/9WreUBxJBQFc7LzlhJDWf0kEkGSUtT
JgoBafYZFRV+jC/XzdJT/uBM5TFsUIR9T/lXHgEos9Edo8ZhgQRiRw8zrGrRedba
w3n4GlhMOl/QCnVtDQ78RfsZI2GZP6eGnolEYmYgkm1vD1uDFTuRccdDP1N6QPwF
f+zkTbKYKOO79gkQRnng+bOK65h0cdtYhg95mWMXRczx/ImebA/OImxj7DwyqHY3
pU4lgtDIqmGtRPyBwzX/N9lcaMG1LR78MAa4SSYugDZjH+t89yld3c57orrhr/Zn
qz5VK4QQ2p1F8bHwjPkxDuXSHnNutHFXsqpDRfC8DQrBEaeIR44heklLC76JeCX+
y7lVR/1+9Q/hn53YR0sggUf+fne7t/VYQIg51k0W5KU++pHMCmlgszoE5WdK88YU
rqzIDNyBncMRw4jtlDXIqDnUC3AeCHJrQFYJg3ZhVQ6Fyxv3IDNXIj95gvZx3Lh9
35XSQq4idrWYrG156Kr2vXxbhj6JZg5A6zfi780Dt6is3QTclnKDyyPTH4ANEAJp
unkmQN+yF9NUVLxrvMNouwxtMI23W3iaM7kkuBguuxXUeEfD/kSVqft61mUbItcC
mt4IfIOZAM6jP6Z90chmHQZpwbTHZ85+fRIiOW0m+awOBNJ27VDvkKk1FdyUAGAl
t9OmlIAyA10Mdw==
=NANz
-----END PGP SIGNATURE-----
We believe that the bug you reported is fixed in the latest version of
git, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1106786@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonathan Nieder <jrnieder@gmail.com> (supplier of updated git package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Tue, 17 Jun 2025 03:50:38 +0200
Source: git
Architecture: source
Version: 1:2.50.0-1
Distribution: unstable
Urgency: medium
Maintainer: Jonathan Nieder <jrnieder@gmail.com>
Changed-By: Jonathan Nieder <jrnieder@gmail.com>
Closes: 1106786
Changes:
git (1:2.50.0-1) unstable; urgency=medium
.
* new upstream release (see RelNotes/2.50.0.adoc).
* in particular, includes the rest of the parse-options fix
from upstream, avoiding size mismatches that on big-endian
64-bit platforms was causing commands like "git grep -A" to
write their argument to the 32 bits after the variable that is
used (thx Sebastian Andrzej Siewior; closes: #1106786).
* debian/patches/*: remove; applied upstream.
Checksums-Sha1:
c0480de6910db6439191c1e6484d1787bbc5e8cf 2697 git_2.50.0-1.dsc
3b6e22b6ef8bfebcdb0bfadc8fd2f10028759a7a 7878256 git_2.50.0.orig.tar.xz
49c0c32153f3d92cd1461d2f0f6021b74445cdd0 811464 git_2.50.0-1.debian.tar.xz
7e44089764542e8657b963a9364e578be5a7a9d4 12543 git_2.50.0-1_amd64.buildinfo
Checksums-Sha256:
d009485666d06fa1226d7cd86fcbd545525ce636f71d677c9ad74fad1e5b88c5 2697 git_2.50.0-1.dsc
dff3c000e400ace3a63b8a6f8b3b76b88ecfdffd4504a04aba4248372cdec045 7878256 git_2.50.0.orig.tar.xz
557248aebb8b3956506b5aedee4a600058338016e4147b0b8957e04a21fe4e8a 811464 git_2.50.0-1.debian.tar.xz
b36ccb6989ae4175d6fecedd2b955a2a48898f227156c727293023159c88acfe 12543 git_2.50.0-1_amd64.buildinfo
Files:
9889f6d3bd836c8c0f897c508188a772 2697 vcs optional git_2.50.0-1.dsc
6e43781d11b99031e18593f44d39313a 7878256 vcs optional git_2.50.0.orig.tar.xz
82e8024bd0de6a12931f89fa1f959f2f 811464 vcs optional git_2.50.0-1.debian.tar.xz
30288eb1ec4eebf6b1734ef3656bb2aa 12543 vcs optional git_2.50.0-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJHBAEBCgAxFiEEUh5Y8X6W1xKqD/EC38Zx7rMz+iUFAmhQzSITHGpybmllZGVy
QGdtYWlsLmNvbQAKCRDfxnHuszP6JdorEACYNd3ILM3MRBCu39RZbsNO8ZRbOal4
RquiBX0iMdaPiyDcIOMoBzKY/C21GUz1BzJfwvBwIOvW+TNlKQ1JMQuY59Bl2k4n
V0hE79YgwRP5xOHZE2DJvOEB1o4Hc6Pbr25muHkQ9pgFZlJAC24iEonTQr2a2GQ/
MWKgNdREAybGSauSxk90DAJpNjDpHkR5LmmWZD30Gn4vG7JaNh1vuwgqPV06GMO4
wYuOFdhA25cwPXZJSxT/WnTVhNsGamDnci/NH3eWH1Q2bZnnFxMYtupWKWHvo1Rt
6OWjgFY+tFKJ9O+doR5nP1yrLq+qqUFfOV1i8tHn+iXjJsjTl3vHny4t48/WbkDh
8jNwW2UZKMnsSORE4h7lWvaW0o9deyfjFtdXoTF3VI8y2xMNvzEhrSFTWkjHhyOl
gAupTUMDWCilAnpC9R9QItA8V8IDP3MB1m5yM3vNhHr2DNSG79TLrUk1p7G11oN1
NS12dZ4zogbyE1sMTMePYRmlRnFhZ34Fwj9drVZWDPijz2enIELi5FmQHm917AT3
3nyCuoPzkIahMFS3PkzLrMLFIIFaO4yFHrp8wd2sTr9QEbAECIJ4MJP1crpzZgbJ
LM8ajYE06mGUGbycpT2M6Zz5/FaMk6JKHTgTIO66kCpo1S4yVWHSY4fj8ZLv9ers
e504XUyD8o2ksg==
=Fg2O
-----END PGP SIGNATURE-----