Bug#906331: Fails when pristine-tar branch contains a merge commit

2018-08-18 Thread Guido Günther
Hi, On Fri, Aug 17, 2018 at 12:12:29PM +0100, Iain Lane wrote: > On Fri, Aug 17, 2018 at 01:04:34PM +0200, Guido Günther wrote: > > We do that to get the last used compression type. If we do a ls-tree > > or even `pristine-tar list` we have no ordering. > > Interesting. I was imagining (without

Bug#906331: Fails when pristine-tar branch contains a merge commit

2018-08-17 Thread Iain Lane
On Fri, Aug 17, 2018 at 01:28:47PM +0200, Guido Günther wrote: > Yeah, exactly. There are some external uses and we don't want to break > API for them. Aha! OK, here's a new patch which does what you suggest. Cheers, -- Iain Lane [ i...@orangesquash.org.uk ]

Bug#906331: Fails when pristine-tar branch contains a merge commit

2018-08-17 Thread Iain Lane
On Fri, Aug 17, 2018 at 01:04:34PM +0200, Guido Günther wrote: > We do that to get the last used compression type. If we do a ls-tree > or even `pristine-tar list` we have no ordering. Interesting. I was imagining (without checking!) that you'd be interested in the compression a particular file

Bug#906331: Fails when pristine-tar branch contains a merge commit

2018-08-17 Thread Guido Günther
control: -1 tags -patch Hi Ian, Thanks! On Fri, Aug 17, 2018 at 11:38:22AM +0100, Iain Lane wrote: [..snip..] > 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

Bug#906331: Fails when pristine-tar branch contains a merge commit

2018-08-17 Thread Iain Lane
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