Your message dated Fri, 11 Feb 2011 18:17:53 +0000
with message-id <[email protected]>
and subject line Bug#610379: fixed in git-buildpackage 0.5.19
has caused the Debian Bug report #610379,
regarding git-import-dsc: copes poorly with missing 'upstream' branch
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.)
--
610379: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=610379
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.5.17
Trying to import history of a Debian package from a git clone
of the upstream repo:
$ git import-dsc ../source-libwpd/libwpd_0.7.2-1.dsc
gbp:info: Tag upstream/0.7.2 not found, importing Upstream tarball
fatal: Needed a single revision
gbp:error: Git command failed: can't find SHA1 for upstream
Two problems:
1) the error message from rev-parse --verify is not so useful.
2) it's not clear to me why git-buildpackage wants the
'upstream' rev in the first place. Couldn't it create
the branch itself?
import-orig gives a friendlier message:
$ git import-orig ../source-libwpd/libwpd_0.7.2.orig.tar.gz
gbp:error:
Repository does not have branch 'upstream' for upstream sources. If there is
none see
file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT
on howto create it otherwise use --upstream-branch to specify it.
Side note: instead of an upstream/0.7.2 tag, this repo has
LIBWPD-0-8-0
LIBWPD-0-8-2
RELEASE-0-3-0
[...]
RELEASE-0-6-3
RELEASE-0-7-1
RELEASE-0-7-2
[...]
RELEASE-0-9-0
libwpd-0-6-2
release-0-7-0
release-0-8-1
start
Patch to somewhat mitigate (1) follows. It might also make sense to
use --quiet unconditionally.
-- 8< --
Subject: Use terminology more consistent with git
When an operation fails due to an unexpectedly absent git
rev, gbp writes
fatal: Needed a single revision
gbp:error: Git command failed: can't find SHA1 for upstream
At first glance it is not obvious that these two messages
have much to do with each other. Follow the git terminology:
fatal: Needed a single revision
gbp:error: Git command failed: revision 'upstream' not found
to make what happened a little clearer.
---
diff --git a/gbp/git.py b/gbp/git.py
index 9fac3ba..26e2728 100644
--- a/gbp/git.py
+++ b/gbp/git.py
@@ -331,7 +331,7 @@ def rev_parse(self, name, quiet=False):
args.insert(0, "--quiet")
sha, ret = self.__git_getoutput('rev-parse', args)
if ret:
- raise GitRepositoryError, "can't find SHA1 for %s" % name
+ raise GitRepositoryError, "revision '%s' not found" % name
return sha[0].strip()
def write_tree(self, index=None):
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.5.19
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:
git-buildpackage_0.5.19.dsc
to main/g/git-buildpackage/git-buildpackage_0.5.19.dsc
git-buildpackage_0.5.19.tar.gz
to main/g/git-buildpackage/git-buildpackage_0.5.19.tar.gz
git-buildpackage_0.5.19_all.deb
to main/g/git-buildpackage/git-buildpackage_0.5.19_all.deb
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: SHA1
Format: 1.8
Date: Fri, 11 Feb 2011 18:20:36 +0100
Source: git-buildpackage
Binary: git-buildpackage
Architecture: source all
Version: 0.5.19
Distribution: unstable
Urgency: low
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
Closes: 607936 610379 612384
Changes:
git-buildpackage (0.5.19) unstable; urgency=low
.
[ Jonathan Nieder ]
* [7f00d39] git-import-dsc: improve error message when upstream branch is
missing
.
[ Guido Günther ]
* [b9acbf9] logging: don't use color inside Emacs's comint shell
(Closes: #612384)
* [14fdbce] gbp-clone: reparse the configuration after cloning the
repository (Closes: #607936)
* [d21506e] git-import-dscs: really use git-import-dsc from the same
location as git-import-dscs
* [b92b88f] git-import-dsc: auto create upstream branch if it's missing.
This allows to mass import old history of packages that were native and
switched to non-native later.
* [0363f47] git-import-dsc: better explain missing upstream branch.
Thanks to Jonathan Nieder for the suggestion. (Closes: #610379)
Checksums-Sha1:
ec988bea05cc748e52d832e9f341018841c524a6 1082 git-buildpackage_0.5.19.dsc
f4c6663fc0e3f0b65da6735463796e64e949032f 99004 git-buildpackage_0.5.19.tar.gz
0c7f9edfd77b4dc725065b7fb75bc953f4dbadc8 123518 git-buildpackage_0.5.19_all.deb
Checksums-Sha256:
641e563e16278b031ef4c39865eb476d56d78a91c004371b916f3a10f2705b59 1082
git-buildpackage_0.5.19.dsc
f3703b767fbe73ea4cd7e5d807476a9f750970aabaa622ca70b4526a54d0d9ac 99004
git-buildpackage_0.5.19.tar.gz
e0c1ea0046371768b25649300c977906d7a9e33a89e4fae1682137fc7a46daab 123518
git-buildpackage_0.5.19_all.deb
Files:
03f75d4932f772a59da4dd75157a5a51 1082 vcs optional git-buildpackage_0.5.19.dsc
7ff11222eaea8bc5619db6b0b56dbfb7 99004 vcs optional
git-buildpackage_0.5.19.tar.gz
ca21f82ed2220f1d348b1f71580ddf61 123518 vcs optional
git-buildpackage_0.5.19_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iD8DBQFNVXpOn88szT8+ZCYRAhn2AJ9+7dMdYuv6rTWmadMKavdlVwW9qwCfT/jp
Et2ZiHw6AXJLIMCvqaSgios=
=Yfb3
-----END PGP SIGNATURE-----
--- End Message ---
