diff options
| -rw-r--r-- | gbp/git/repository.py | 4 | ||||
| -rw-r--r-- | gbp/pkg/pristinetar.py | 2 | ||||
| -rwxr-xr-x | gbp/scripts/export_orig.py | 2 | ||||
| -rw-r--r-- | tests/05_test_detection.py | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 1fc92ee9..827bf17b 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -1645,7 +1645,7 @@ class GitRepository(object): raise GitRepositoryError("can't get %s: %s" % (id, stderr.decode().rstrip())) return obj - def grep_log(self, regex, since=None): + def grep_log(self, regex, since=None, merges=True): """ Get commmits matching I{regex} @@ -1655,6 +1655,8 @@ class GitRepository(object): @type since: C{str} """ args = ['--pretty=format:%H'] + if not merges: + args.append("--no-merges") args.append("--grep=%s" % regex) if since: args.append(since) diff --git a/gbp/pkg/pristinetar.py b/gbp/pkg/pristinetar.py index 1da72bfb..be301326 100644 --- a/gbp/pkg/pristinetar.py +++ b/gbp/pkg/pristinetar.py @@ -71,7 +71,7 @@ class PristineTar(Command): return None regex = ('pristine-tar .* %s' % archive_regexp) - commits = self.repo.grep_log(regex, self.branch) + commits = self.repo.grep_log(regex, self.branch, merges=False) if commits: commit = commits[-1] gbp.log.debug("Found pristine-tar commit at '%s'" % commit) diff --git a/gbp/scripts/export_orig.py b/gbp/scripts/export_orig.py index 95b83da5..ea6c8870 100755 --- a/gbp/scripts/export_orig.py +++ b/gbp/scripts/export_orig.py @@ -236,7 +236,7 @@ def guess_comp_type(comp_type, source, repo, tarball_dir): if comp_type == 'auto': if repo and repo.has_pristine_tar_branch(): regex = 'pristine-tar .* %s_%s\.orig.tar\.' % (source.name, source.upstream_version) - commits = repo.grep_log(regex, repo.pristine_tar_branch) + commits = repo.grep_log(regex, repo.pristine_tar_branch, merges=False) if commits: commit = commits[-1] gbp.log.debug("Found pristine-tar commit at '%s'" % commit) 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): |