From: Daan De Meyer <daan@amutable.com>
Date: Sat, 14 Feb 2026 15:04:08 +0000 (+0100)
Subject: tools: Fix changelog generation (again)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ae7db99bf9b877ba8467d42a63348ad0bd4fe90;p=thirdparty%2Fsystemd.git

tools: Fix changelog generation (again)

Using --first-parent --no-merges seems to exclude not just the merge
commits but all the commits from the merge as well. Let's use only
--no-merges to get just the commits without merges.
---

diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py
index 4387af83974..00b8eca4d18 100755
--- a/tools/fetch-distro.py
+++ b/tools/fetch-distro.py
@@ -123,7 +123,7 @@ def update_distro(args, distro: str, config: dict):
         print(f'{pkg_subdir}: commit {new_commit!s} is still fresh')
         return
 
-    cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'log', '--graph', '--first-parent',
+    cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'log', '--graph', '--no-merges',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     if subdir is not None:
diff --git a/tools/fetch-mkosi.py b/tools/fetch-mkosi.py
index 186b1b52db0..6e6440d65ef 100755
--- a/tools/fetch-mkosi.py
+++ b/tools/fetch-mkosi.py
@@ -75,7 +75,7 @@ def update_mkosi(args):
         print(f'mkosi: commit {new_commit!s} is still fresh')
         return
 
-    cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', '--first-parent', '--no-merges',
+    cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', '--no-merges',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     print(f"+ {shlex.join(cmd)}")