From be07b06f2c9ddbf04e20f6480cd62c32e1c458a9 Mon Sep 17 00:00:00 2001 From: Rene Meusel Date: Fri, 29 Sep 2023 15:08:40 +0200 Subject: [PATCH] FIX (maybe): git log --- tools/genaudit/genaudit/repo.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/genaudit/genaudit/repo.py b/tools/genaudit/genaudit/repo.py index d3c48331..8ba993e5 100644 --- a/tools/genaudit/genaudit/repo.py +++ b/tools/genaudit/genaudit/repo.py @@ -64,7 +64,8 @@ def merged_pull_requests_between(self, start_ref, end_ref) -> list[refs.PullRequ "--no-abbrev-commit", "--grep=^Merge pull request", "--grep=^Merge GH", - "%s..%s" % (start_ref, end_ref)]) + "%s..%s" % (start_ref, end_ref), + "--"]) return [self._extract_pull_request_info(line) for line in out.splitlines()] @@ -76,7 +77,8 @@ def manual_merge_commits_to_main_branch_between(self, start_ref, end_ref) -> lis "--grep=^Merge pull request", "--grep=^Merge GH", "--invert-grep", - "%s..%s" % (start_ref, end_ref)]) + "%s..%s" % (start_ref, end_ref), + "--"]) return self._extract_commit_ref_from_log_output(out) @@ -95,14 +97,16 @@ def commits_to_main_branch_between(self, start_ref, end_ref) -> list[refs.Commit "--oneline", "--no-abbrev-commit", "--no-merges", - "^%s" % start_ref])) + "^%s" % start_ref, + "--"])) all_commits_between_start_and_end_ref = self._extract_commit_ref_from_log_output( self._run_git(["log", "--no-decorate", "--oneline", "--no-abbrev-commit", "--no-merges", - "%s..%s" % (start_ref, end_ref)])) + "%s..%s" % (start_ref, end_ref), + "--"])) return [sha for sha in all_commits_between_start_and_end_ref if sha in commits_to_main_since_start_ref] def tip_of_main_branch(self) -> Commit: