diff options
| author | Luca Boccassi <luca.boccassi@gmail.com> | 2024-11-13 18:03:35 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-11-13 18:03:35 +0100 |
| commit | d9822cd859f91394455c58bae81caed7bbb15bd0 (patch) | |
| tree | 6ba9fe134ad4190a6cfdda996940a14ee6a4d0a8 /tools | |
| parent | namespace-util: pin pid via pidfd during namespace_open() (diff) | |
| download | systemd-d9822cd859f91394455c58bae81caed7bbb15bd0.tar.xz systemd-d9822cd859f91394455c58bae81caed7bbb15bd0.zip | |
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.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/fetch-distro.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py index 9fc5b1bfa6..1da1b8486e 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)}") |