Your message dated Sat, 02 Aug 2025 18:20:25 +0000
with message-id <[email protected]>
and subject line Bug#1110119: fixed in gnulib 20250303-2
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-2
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, 02 Aug 2025 13:45:49 +0200
Source: gnulib
Architecture: source
Version: 20250303-2
Distribution: experimental
Urgency: medium
Maintainer: Simon Josefsson <[email protected]>
Changed-By: Simon Josefsson <[email protected]>
Closes: 1110119
Changes:
gnulib (20250303-2) experimental; urgency=medium
.
* Fix git-merge-changelog. Closes: #1110119.
Checksums-Sha1:
c8e359f3840d1c5da94990ab1f914635122f6b62 2904 gnulib_20250303-2.dsc
c000e4a624d37814a1fa2241110f733b15d6d539 336676 gnulib_20250303-2.debian.tar.xz
Checksums-Sha256:
0b07a7b74662b010ca4b7d97bf9a13348badafde39588cdac41d2460e8f202eb 2904
gnulib_20250303-2.dsc
f9f6d900c20411c073e110b3b72c875053ddbd00dea6dd274e639619aa68c36f 336676
gnulib_20250303-2.debian.tar.xz
Files:
7c3420cfcac82af94cf6e42e65e76f52 2904 devel optional gnulib_20250303-2.dsc
7f632ad8880dc7e8dae9e3e0947ef90e 336676 devel optional
gnulib_20250303-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQNoBAEWCgMQFiEEo8ychwudMQq61M8vUXIrCP5HRaIFAmiOUfUUHHNpbW9uQGpv
c2Vmc3Nvbi5vcmfCHCYAmDMEXJLOtBYJKwYBBAHaRw8BAQdACIcrZIvhrxDBkK9f
V+QlTmXxo2naObDuGtw58YaxlOu0JVNpbW9uIEpvc2Vmc3NvbiA8c2ltb25Aam9z
ZWZzc29uLm9yZz6IlgQTFggAPgIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgBYh
BLHSvRN1vst4TPT4xNc89jjFPAa+BQJn0XQkBQkNZGbwAAoJENc89jjFPAa+BtIA
/iR73CfBurG9y8pASh3cbGOMHpDZfMAtosu6jbpO69GHAP4p7l57d+iVty2VQMsx
+3TCSAvZkpr4P/FuTzZ8JZe8BrgzBFySz4EWCSsGAQQB2kcPAQEHQOxTCIOaeXAx
I2hIX4HK9bQTpNVei708oNr1Klm8qCGKiPUEGBYIACYCGwIWIQSx0r0Tdb7LeEz0
+MTXPPY4xTwGvgUCZ9F0SgUJDWRmSQCBdiAEGRYIAB0WIQSjzJyHC50xCrrUzy9R
cisI/kdFogUCXJLPgQAKCRBRcisI/kdFoqdMAQCgH45aseZgIrwKOvUOA9QfsmeE
8GZHYNuFHmM9FEQS6AD6A4x5aYvoY6lo98pgtw2HPDhmcCXFItjXCrV4A0GmJA4J
ENc89jjFPAa+wUUBAO64fbZek6FPlRK0DrlWsrjCXuLi6PUxyzCAY6lG2nhUAQC6
qobB9mkZlZ0qihy1x4JRtflqFcqqT9n7iUZkCDIiDbg4BFySz2oSCisGAQQBl1UB
BQEBB0AxlRumDW6nZY7A+VCfek9VpEx6PJmdJyYPt3lNHMd6HAMBCAeIfgQYFggA
JgIbDBYhBLHSvRN1vst4TPT4xNc89jjFPAa+BQJn0XTSBQkNZGboAAoJENc89jjF
PAa+0M0BAPPRq73kLnHYNDMniVBOzUdi2XeF32idjEWWfjvyIJUOAP4wZ+ALxIeh
is3Uw2BzGZE6ttXQ2Q+DeCJO3TPpIqaXDAAKCRBRcisI/kdFojNUAQDH6nNIr2SJ
PCG4iTDxtq9qk6N35V9JX9nEUzHauFcjpgD/aJ4ICqKYcHqiAhc7negLFzpicVWh
mi6Amz0J8T9d9ws=
=8TsS
-----END PGP SIGNATURE-----
pgp6McP22TrGD.pgp
Description: PGP signature
--- End Message ---
