From 5fedb2baf1b03c3c128898de545984c1622bac79 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Fri, 17 Aug 2018 11:22:01 +0100 Subject: Ignore merge commits when looking at the pristine-tar branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When there is a merge commit in this branch, we currently get the warning: gbp:warning: Unknown compression type of Merge branch 'pristine-tar' into 'pristine-tar', assuming gzip because we're grepping the commit logs to find out the compression type of the tarballs in there. For now, we can just use `git log ... --no-merges' to not see these commits. Signed-off-by: Guido Günther Closes: #906331 --- tests/05_test_detection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/05_test_detection.py b/tests/05_test_detection.py index d2579dfa..5e903db3 100644 --- a/tests/05_test_detection.py +++ b/tests/05_test_detection.py @@ -24,7 +24,7 @@ class MockGitRepository: def pristine_tar_branch(self): 'pristine-tar' - def grep_log(self, regex, branch): + def grep_log(self, regex, branch, merges=True): return None def get_commit_info(self, commit): -- cgit v1.2.3