Package: git-buildpackage Version: 0.6.9 Severity: normal Hi, thanks for nice tool.
"--create-missing-branches option" has two problem. 1. It is not documented in the manpage. 2. It seems to work only with upstream branch even if some custom branch name is requested with "--upstream-branch=fancy" but not with debian branch if some custom branch name is requested with "--debian-branch=debian" It looks like bug fix for #660898 is working only on missing upstream branch case. Please add the similar code for missing debian branch. Here is my test case with a simple git repo with master branch holding the upstream source without autotool generated junks. I try to import tarball and package containing autotools generated files in different branch without creating branch in advance: $ git-import-dsc --pristine-tar --debian-branch=debian ../hello-c_1.5-1.dsc gbp:info: Tag upstream/1.5 not found, importing Upstream tarball 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. Also check the --create-missing-branches option. OK... now I know this hidden feature. Thanks for fixing https://bugs.debian.org/660898 But this did not work for my case when debian branch was not there. $ git-import-dsc --pristine-tar --debian-branch=debian --create-missing-branches ../hello-c_1.5-1.dsc gbp:info: Tag upstream/1.5 not found, importing Upstream tarball gbp:info: Creating missing branch 'upstream' pristine-tar: committed hello-c_1.5.orig.tar.gz.delta to branch pristine-tar gbp:error: Failed to import Debian package: revision 'debian' not found Let me check a bit more by creating debian branch on maser HEAD and try: $ git-import-dsc --pristine-tar --debian-branch=debian --upstream-branch=tarball-src --create-missing-branches ../hello-c_1.5-1.dsc gbp:info: Tag upstream/1.5 not found, importing Upstream tarball gbp:info: Creating missing branch 'tarball-src' pristine-tar: committed hello-c_1.5.orig.tar.gz.delta to branch pristine-tar gbp:info: Version '1.5-1' imported under 'hello-c' $ git branch debian * master pristine-tar tarball-src So as long as there is debian branch, it works. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.12-1-amd64 (SMP w/8 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages git-buildpackage depends on: ii devscripts 2.14.1 ii git 1:1.9.0~rc3-1 ii man-db 2.6.6-1 ii python 2.7.5-5 ii python-dateutil 1.5+dfsg-1 ii python-pkg-resources 2.1-1 Versions of packages git-buildpackage recommends: ii cowbuilder 0.73 ii pristine-tar 1.30 Versions of packages git-buildpackage suggests: ii python-notify 0.1.1-3 ii unzip 6.0-10 -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
