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 4387af839742c957134996111f6cb1457c935f99..00b8eca4d1847ed72180aad0a92e417eb1311378 100755 (executable)
--- 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 186b1b52db0cb913a90ef5068c73f4c243127c91..6e6440d65ef9c7d090300fc043f5b76818f6bd8f 100755 (executable)
--- 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)}")