upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-05-13 15:13:36 +00:00
Code Activity

git-merge-changelog: Fix essential functionality (regr. 2023-05-21).

Browse Source 
Fixes two mistakes in commit a8921605af.

Reported by Patrice Dumas <pertusus@free.fr> 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.
This commit is contained in:
Bruno Haible
2025-07-29 09:11:40 +02:00
parent 1ce8849f3a
commit 21b208f43a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2025-07-29 Bruno Haible <bruno@clisp.org>
git-merge-changelog: Fix essential functionality (regr. 2023-05-21).
Fixes two mistakes in commit a8921605af342b9061e04e18fc952d386e5a071c.
Reported by Patrice Dumas <pertusus@free.fr> 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 <eggert@cs.ucla.edu>
float-h: change IBM long double to match GCC 15

10
lib/git-merge-changelog.c
View File

@@ -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);
}