Your message dated Sun, 19 Aug 2018 07:19:25 +0000
with message-id <[email protected]>
and subject line Bug#906331: fixed in git-buildpackage 0.9.10
has caused the Debian Bug report #906331,
regarding Fails when pristine-tar branch contains a merge commit
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
906331: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906331
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.9.9
Severity: normal
Tags: patch
Hey,
[ as spoilered over private email ;-) ]
We currently grep the log of the pristine-tar branch to find out which
compression type the tarball we're interested in has. The regex we use
to do that fails when it encounters something unknown - like a merge
commit. Like this:
gbp:warning: Unknown compression type of Merge branch 'pristine-tar' into
'pristine-tar', assuming gzip
gbp:info: Tarballs 'gnome-session_3.29.90.orig.tar.gz' not found at
'../tarballs/'
gbp:info: Creating
/home/laney/dev/debian/packaging/pkg-gnome/build-area/gnome-session_3.29.90.orig.tar.gz
gbp:error: Error creating gnome-session_3.29.90.orig.tar.gz: Pristine-tar
couldn't checkout "gnome-session_3.29.90.orig.tar.gz": fatal: Path
'gnome-session_3.29.90.orig.tar.gz.delta' does not exist in
'refs/heads/pristine-tar'
pristine-tar: git show
refs/heads/pristine-tar:gnome-session_3.29.90.orig.tar.gz.delta failed
(We might get a merge commit if someone clicks the 'merge' button in
salsa, for example.)
This can be worked around by passing "--no-merges" to the git log
invocation. That's what the attached patch does. Please could you review
it?
Don't let this stop you from merging the commit (I don't know if I'll
have time to write this patch soon if it's the right idea and I have the
other one already which works), but is there a reason why we don't use
e.g. "git ls-tree -r --name-only pristine-tar" and look at the filenames
in the branch directly?
Cheers,
--
Iain Lane [ [email protected] ]
Debian Developer [ [email protected] ]
Ubuntu Developer [ [email protected] ]
>From 0e222c0591aec4d9b2644e951b2a07f6205d71c3 Mon Sep 17 00:00:00 2001
From: Iain Lane <[email protected]>
Date: Fri, 17 Aug 2018 11:22:01 +0100
Subject: [PATCH] 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.
---
gbp/git/repository.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 1fc92ee9..19778710 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -1654,7 +1654,7 @@ class GitRepository(object):
@param since: where to start grepping (e.g. a branch)
@type since: C{str}
"""
- args = ['--pretty=format:%H']
+ args = ['--pretty=format:%H', '--no-merges']
args.append("--grep=%s" % regex)
if since:
args.append(since)
--
2.17.1
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.9.10
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guido Günther <[email protected]> (supplier of updated git-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 19 Aug 2018 08:29:47 +0200
Source: git-buildpackage
Binary: git-buildpackage git-buildpackage-rpm
Architecture: source
Version: 0.9.10
Distribution: unstable
Urgency: medium
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Description:
git-buildpackage - Suite to help with Debian packages in Git repositories
git-buildpackage-rpm - Suite to help with RPM packages in Git repositories
Closes: 882187 899234 900606 900841 906331
Changes:
git-buildpackage (0.9.10) unstable; urgency=medium
.
[ Ken Dreyer ]
* [f0b1bbe] deb.git: fix duplicate "tarball" in docstring.
Fix the docstring for create_pristine_tar_commits()
* [29b9f2c] deb.git: fix spelling of "described" in docstring.
Fix the docstring for _sanitize_version() and _unsanitize_version()
.
[ Guido Günther ]
* [62e0102] push: Allow to skip upstream and debian branch and tag push.
Push of tag and or branch can be skipped by setting
--{upstream,debian}-{branch,tag}='' . (Closes: #899234)
* [28a950a] tests: Check help output of tag and push too
* [a287bf6] config: allow to override default values via
add_config_file_option
* [b8221b8] pull: Check that repo is clean before fetching anything
* [6dda2da] pull: allow to set up branch tracking for missing branches.
If the remote branch does not exist at all that's currently not fatal.
(Closes: #882187)
* [d69006d] Depend on sensible-utils. gbp-dch uses sensible-editor.
.
[ Chris Lamb ]
* [6c30ac9] import-{dsc,orig}: Make --download deprecation text more useful.
Point to the manpages for usage examples. (Closes: #900606)
.
[ Guus Sliepen ]
* [48ef0ec] changelog: try iso8859-1 when utf-8 fails.
Fall back to iso8859-1 when opening the changelog. Helps when importing
old versions. (Closes: #900841)
.
[ Carsten Schoenert ]
* [50b9223] create_remote_repo: import urllib.parse
urllib.parse did not get imported in packaegs without changelog.
.
[ Iain Lane ]
* [5fedb2b] Ignore merge commits when looking at the pristine-tar branch.
(Closes: #906331)
Checksums-Sha1:
4aed01a443a8c508e5e802b32ca6bc6ea3df0fb9 2277 git-buildpackage_0.9.10.dsc
edd373154c6754fe705a6ca561ed8cd25e52264e 2388764 git-buildpackage_0.9.10.tar.xz
8065d97e17d9475c52f4b3a8c81d83273f12d280 11843
git-buildpackage_0.9.10_amd64.buildinfo
Checksums-Sha256:
c765b908c67b75ca22e371c07d7212e26517f420defd096f4d59ab6b8befb197 2277
git-buildpackage_0.9.10.dsc
e5d82a50544cefbf1bf3254db90efe905e2d213ff7e5baadbd2d63071b507b13 2388764
git-buildpackage_0.9.10.tar.xz
d32a792526b9e5c5f7a37fb72b52816cf1a134527adfcfac78cd4609f5a35657 11843
git-buildpackage_0.9.10_amd64.buildinfo
Files:
e054d14787ac08664bd846e916699307 2277 vcs optional git-buildpackage_0.9.10.dsc
cbc4c5a720bbb1aa94288dd571d4018a 2388764 vcs optional
git-buildpackage_0.9.10.tar.xz
c6dd8bc78d7e7a73dbac97f2bc878d49 11843 vcs optional
git-buildpackage_0.9.10_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEvHzQcjh1660F3xzZB7i3sOqYEgsFAlt5E6IACgkQB7i3sOqY
EgtOHxAAs7elZ3p0VDLoh039X2BBMtoFGQkd2IW49USQ7qWEjPIFGWaUvNx2u9HS
hGE4+xtBRE8G+K1KLwVpexdtBbCmulTy9MQCp/JXk/m/ALjLR0Pd+50e5b6SsPZL
4Sn9rS0UU+LxaccNZkIfqA5BKVukbSRd9PGiOEsMH/ZoX+uqa0E7l237Zu0oWtXd
Fpo0J6ztNE26RxawEa2lb+9HDXEnKGrZbfG60eeKVNHOyZ7sMA4Fx+7RujI87h6Z
BXMRTxLEoBkrip5ZbZvyU2Mmym29DrHUEW8qWWs08XDkrOzBFnO6rBapcwiAIv9C
DGOuFh8pHvv1UQrU30QKHITUEEmOvH0lXu5nUWJo/R1hkYiuo3yhIw+Ui/AQ/Gz9
j6hJXuEn2uofVQXY55w2hG2bR/kY/tpiPLisPqvixJMyX+8mo+5+freXtMd8l2ta
nikRs/Sq3qVAc1n5kgYZFs1RhKMd7h0cr6zUq3g/3SfBegXjuO5N7OW0jWqoW+nX
i7W40ovHUWGGrZ52bCn7184UIQeSIX6viwaApAge9H6ojgUTI0jXhOFk8KDfDhG6
ELeZ4B7EV5HZFPt8Db1yXuEGnSUhD7ukWjKkiGNxmFYNKBZOdliBYjw+3yBXiUb6
aNd1CHUR4rSP4HsGymXs9I2mLsr0M4YUebG37d9lwbiSvNR+1XY=
=MtWs
-----END PGP SIGNATURE-----
--- End Message ---
