diff options
| author | Iain Lane <laney@debian.org> | 2018-08-17 11:22:01 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-08-17 15:35:12 +0200 |
| commit | 5fedb2baf1b03c3c128898de545984c1622bac79 (patch) | |
| tree | 382d792af3d109a725d7c198941abe771d31a889 /gbp/pkg | |
| parent | 8b266be2def8ec346d8f91ef54e2f4fa8edd9532 (diff) | |
Ignore merge commits when looking at the pristine-tar branch
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 <agx@sigxcpu.org>
Closes: #906331
Diffstat (limited to 'gbp/pkg')
| -rw-r--r-- | gbp/pkg/pristinetar.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |