Hello Johannes, On Fri, Jun 16, 2017 at 02:31:58PM +0200, Johannes Schauer wrote: > Your patch makes the whole process quite convoluted. How about this instead: > > $ mkdir foo > $ cd foo > $ git init > $ gbp import-orig --upstream-branch=upstream --debian-branch=master > --upstream-tag='%(version)s' --sign-tags --no-pristine-tar ...
Personally, I find this long command line much more convoluted :) While my patch does add quite a few lines, they are all standard git. > Also, did you test this approach? I'm getting: > > gbp:info: Importing '/home/josch/git/deb/searx_0.12.0+dfsg1.orig.tar.xz' to > branch 'upstream'... > gbp:info: Source package is searx > gbp:info: Upstream version is 0.12.0+dfsg1 > gbp:info: Merging to 'master' > gbp:error: Automatic merge failed. > gbp:error: Error detected, Will roll back changes. Yes, I tested it. You are probably encountering #864881. > Maybe one should also look into the config file again because options > like pristine-tar-commit do not appear in > /etc/git-buildpackage/gbp.conf and do not even seem to have a > corresponding command line equivalent and other options like sign-tags > seem to belong into the [buildpackage] section instead of the > [default] section. They are indeed for `gbp buildpackage`, but it is permissible to put them under DEFAULT -- see gbp.conf(5). -- Sean Whitton
signature.asc
Description: PGP signature
