Hi Sean, On Fri, Jun 16, 2017 at 01:04:24PM +0100, Sean Whitton wrote: > Package: git-buildpackage > Version: 0.8.16 > Severity: normal > Control: block 864873 by -1 > > Dear maintainer, > > In the gbp docs, the section "Converting an existing Git repository" > recommends using `git checkout --orphan upstream` to create an empty > upstream branch, for the case of a repository that does not yet have > upstream sources on a branch. > > However, back on the master branch, `gbp import-orig` fails because git > refuses to merge unrelated histories without > --allow-unrelated-histories. I believe that gbp should pass this option > to git in this case.
I opted for adding this to the docs instead of import-orig since - it's not necerray for 3.0 (quilt) packages since they don't invoke git merge by default - it makes it obvious what is going on It might be nice to be able to merge unrelated histories with gbp but I'd rather see a better use case for this. Importing things without an upstream branch needs special setup atm anyway. Cheers -- Guido
