From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 13 Nov 2024 17:03:35 +0000 (+0000)
Subject: fetch-distro: use git log --first-parent
X-Git-Tag: v257-rc2~20^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9822cd859f91394455c58bae81caed7bbb15bd0;p=thirdparty%2Fsystemd.git

fetch-distro: use git log --first-parent

We now import the upstream tag in the debian repository, so
this explodes as it tries to walk all upstream commits. Use
--first-parent so that merges only get added via the merge
commit.
---

diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py
index 9fc5b1bfa62..1da1b8486e2 100755
--- a/tools/fetch-distro.py
+++ b/tools/fetch-distro.py
@@ -96,7 +96,7 @@ def update_distro(args, distro: str, config: dict):
         print(f'{distro}: commit {new_commit!s} is still fresh')
         return
 
-    cmd = ['git', '-C', f'pkg/{distro}', 'log', '--graph',
+    cmd = ['git', '-C', f'pkg/{distro}', 'log', '--graph', '--first-parent',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     print(f"+ {shlex.join(cmd)}")