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 9fc5b1bfa62a377c1412b25d9101896ab91f3f6d..1da1b8486e23700b4268bf750b85d40d94cbe2c6 100755 (executable)
--- 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)}")