From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 26 Jun 2025 11:28:01 +0000 (+0200)
Subject: tools: Fix fetch-mkosi changelog generation
X-Git-Tag: v258-rc1~243^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1095865d2613f4589848a1c05e0f47ff959a134e;p=thirdparty%2Fsystemd.git

tools: Fix fetch-mkosi changelog generation
---

diff --git a/tools/fetch-mkosi.py b/tools/fetch-mkosi.py
index 175bb45990d..b18adf7bfa4 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',
+    cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', '--first-parent', '--no-merges',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     print(f"+ {shlex.join(cmd)}")