Your message dated Sat, 16 Aug 2025 13:24:23 +0000
with message-id <[email protected]>
and subject line Bug#1110119: fixed in gnulib 20250303-3
has caused the Debian Bug report #1110119,
regarding git-merge-changelog loses or corrupts ChangeLog entries
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1110119: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1110119
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-merge-changelog
Version: 20240117+stable-1
Severity: grave
Tags: patch upstream
Justification: renders package unusable
X-Debbugs-Cc: [email protected]
Dear Maintainer,
*** Reporter, please consider answering these questions, where appropriate ***
* What led up to the situation?
I configured git-merge-changelog as my merge driver, as documented.
* What exactly did you do (or not do) that was effective (or
ineffective)?
Then I did "git pull" in a git repository with a ChangeLog, in which I had
a commit of my own, that modified ChangeLog.
* What was the outcome of this action?
Either my ChangeLog change was lost (reported at
https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00181.html)
or my ChangeLog change overwrote the first of the pulled
ChangeLog changes (reported at
https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00198.html).
* What outcome did you expect instead?
I expected the ChangeLog to contain all pulled entries,
plus my own one on top.
That's precisely the point of using 'git-merge-changelog'.
*** End of the template - remove these template lines ***
-- System Information:
Debian Release: trixie/sid
APT prefers noble-updates
APT policy: (500, 'noble-updates'), (500, 'noble-security'), (500, 'noble'),
(100, 'noble-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.8.0-63-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages git-merge-changelog depends on:
ii libc6 2.39-0ubuntu8.5
git-merge-changelog recommends no packages.
git-merge-changelog suggests no packages.
-- no debconf information
>From 21b208f43ab851f9d0747cd45ec67b1b3827e8a2 Mon Sep 17 00:00:00 2001
From: Bruno Haible <[email protected]>
Date: Tue, 29 Jul 2025 09:11:40 +0200
Subject: [PATCH 1/4] git-merge-changelog: Fix essential functionality (regr.
2023-05-21).
Fixes two mistakes in commit a8921605af342b9061e04e18fc952d386e5a071c.
Reported by Patrice Dumas <[email protected]> in
<https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00181.html>.
* lib/git-merge-changelog.c (main): Fix off-by-one mistakes in crucial
places.
---
ChangeLog | 9 +++++++++
lib/git-merge-changelog.c | 10 ++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a5a766deec..e18ef65048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-07-29 Bruno Haible <[email protected]>
+
+ git-merge-changelog: Fix essential functionality (regr. 2023-05-21).
+ Fixes two mistakes in commit a8921605af342b9061e04e18fc952d386e5a071c.
+ Reported by Patrice Dumas <[email protected]> in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00181.html>.
+ * lib/git-merge-changelog.c (main): Fix off-by-one mistakes in crucial
+ places.
+
2025-07-28 Paul Eggert <[email protected]>
float-h: change IBM long double to match GCC 15
diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 190dafc140..cc496bb4cb 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -1242,10 +1242,9 @@ There is NO WARRANTY, to the extent permitted by law.\n\
{
/* An addition to the top of modified_file.
Apply it to the top of mainstream_file. */
- idx_t j;
- for (j = edit->j2; j > edit->j1; )
+ ptrdiff_t j;
+ for (j = edit->j2; j >= edit->j1; j--)
{
- j--;
struct entry *added_entry = modified_file.entries[j];
gl_list_add_first (result_entries, added_entry);
}
@@ -1623,11 +1622,10 @@ There is NO WARRANTY, to the extent permitted by law.\n\
{
gl_list_node_t node_for_insert =
result_entries_pointers[k_first];
- idx_t j;
+ ptrdiff_t j;
idx_t i;
- for (j = edit->j2; j > edit->j1; )
+ for (j = edit->j2; j >= edit->j1; j--)
{
- j--;
struct entry *new_entry =
modified_file.entries[j];
gl_list_add_before (result_entries,
node_for_insert, new_entry);
}
--
2.50.1
--- End Message ---
--- Begin Message ---
Source: gnulib
Source-Version: 20250303-3
Done: Simon Josefsson <[email protected]>
We believe that the bug you reported is fixed in the latest version of
gnulib, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Simon Josefsson <[email protected]> (supplier of updated gnulib 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 16 Aug 2025 14:41:27 +0200
Source: gnulib
Architecture: source
Version: 20250303-3
Distribution: unstable
Urgency: medium
Maintainer: Simon Josefsson <[email protected]>
Changed-By: Simon Josefsson <[email protected]>
Closes: 1110119
Changes:
gnulib (20250303-3) unstable; urgency=medium
.
* Upload to unstable.
.
gnulib (20250303-2) experimental; urgency=medium
.
* Fix git-merge-changelog. Closes: #1110119.
Checksums-Sha1:
2480691c0e867670765a1f79d739dab93944b7b1 2642 gnulib_20250303-3.dsc
7cfabcaaccd44fe6f7a17b73cec091636442a7de 336708 gnulib_20250303-3.debian.tar.xz
606afdbfda8c197de4a1b0a430e6a4e796e863db 183393420 gnulib_20250303-3.git.tar.xz
683d69ae8227e1793353cced2eacddb8326101dd 18062
gnulib_20250303-3_source.buildinfo
Checksums-Sha256:
52a611e34a0e29e7b902a6d2cf0139eb3ac267d0e9c719f467f7cf93bc5cee42 2642
gnulib_20250303-3.dsc
7135f98aed29ac41596dfe25a5c817d2e399ef06389d2d6afdddf7ec9e218c72 336708
gnulib_20250303-3.debian.tar.xz
01d067b9a809e7c60986be20a82d288621bc422086529825f66bcd4af7cd1e5b 183393420
gnulib_20250303-3.git.tar.xz
a7fdfdf8f506b968508297e8ced8967145f9965754f905b017b54d18b75f41ad 18062
gnulib_20250303-3_source.buildinfo
Files:
59989e6d2780158391400ea81644210e 2642 devel optional gnulib_20250303-3.dsc
f1b61f398e3b204b79636056c4075d2a 336708 devel optional
gnulib_20250303-3.debian.tar.xz
bd3aa380a015fdf08afc5118ba6fb4bc 183393420 devel optional
gnulib_20250303-3.git.tar.xz
33d245861a63c9c6a03ad6394f9d0619 18062 devel optional
gnulib_20250303-3_source.buildinfo
Git-Tag-Info: tag=c4aa0ad47101a58d898186d8676facaf33f5371d
fp=a3cc9c870b9d310abad4cf2f51722b08fe4745a2
Git-Tag-Tagger: Simon Josefsson <[email protected]>
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEN02M5NuW6cvUwJcqYG0ITkaDwHkFAmigfw8ACgkQYG0ITkaD
wHmwkg//RmnGGs5ixwPh5oK0lcMTNqzVUSbEwUIz3romMhyDxPx1ap1bS5DZ/bGi
r0rfDj89HdnTPKsjOW9XHW1iATExNiEJSPcQILKfYaohhUDtF5fLRfFeF7VzRgMO
+q175nOTaHJb4IU/F+d6l7RFyJVV7BqWtmejoVsqISoLb0cVLf1uN285olBQPAeU
wjQgSM71RCG28onJSK6oB6MyQBd7ETUXrvGpkwtI4MxyGIqkpXTNxwxf90DmQQ1U
h8DZxiOPLn/Y9BOw+wc3XUkv6DEsJEIeoe7OH2en3rf1xa7UOzzq0OmvMLR2Of4i
AGUJ+pyMJdf2UKbpjSVL1ar5ajez+5Vc5MJkEWYnt1qhxaI/daVMgUph4zzDReO/
hMlgcwye+3VN9rHHvJacbf/oPn2bTBpRspNxJBn6P2VCMBm6zpPzqLOSbMKzwqWX
EBJO61bJApu6Fy5CIKM6jvGhEnEyJybDkS8Fopmv33N9PA8VjsoC0sGr4l6P5sRB
avLhlF0NoaYt0RJ0iiYhk2/aAnbfAWcqiqzryI5sHk5w+fO7OPhVAp1dkVNy9/t2
5Wd47TBaNvRUyqkgHSRKoZFqqvjJos3OeyZzb83HqquxRytX+hXkAmbn526LikIv
WvROWJgM8G+uCWldaNBUgQARQMERqfrP2fiybMHs7khCTZ0O0JA=
=jMgh
-----END PGP SIGNATURE-----
pgpvEHCrE6sMD.pgp
Description: PGP signature
--- End Message ---
