Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-21 Thread Sean Whitton
Hello, On Sun 21 Jul 2019 at 07:38AM +01, Sean Whitton wrote: >> I have tiny style comments: > > Noted for the future, thanks. (I agree that it's a matter of taste and we do not share the relevant tastes, except that we agree the git_diff_rc variable should be local.) -- Sean Whitton

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-21 Thread Sean Whitton
Hello, On Sat 20 Jul 2019 at 11:37PM +01, Ian Jackson wrote: > Sean Whitton writes ("Bug#932476: git-debpush gbp/unapplied upstream tree > check"): >> New patch attached addressing all of this -- thanks for the review! > > Great, thanks. > > Acked-by: Ian Ja

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-20 Thread Ian Jackson
Sean Whitton writes ("Bug#932476: git-debpush gbp/unapplied upstream tree check"): > New patch attached addressing all of this -- thanks for the review! Great, thanks. Acked-by: Ian Jackson And in my master. (IDK if you noticed that the previous version broke the tagupl-gbp test

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-20 Thread Sean Whitton
Hello, On Sat 20 Jul 2019 at 06:59PM +01, Ian Jackson wrote: > I'm afraid I don't like this very much. > > * Can we lead with a case which switches on the quilt mode ? > That will provide a place to add other checks for other quilt modes. > > * Please use the git file selector syntax and

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-20 Thread Ian Jackson
Sean Whitton writes ("Bug#932476: git-debpush gbp/unapplied upstream tree check"): > Patch attached. > > Based on series in #932459. Thanks. > +# Upstream tag tree nonidentical > + > +if ! [ "x$upstream_tag" = "x

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-20 Thread Ian Jackson
Sean Whitton writes ("Re: Bug#932476: git-debpush gbp/unapplied upstream tree check"): > On Fri 19 Jul 2019 at 10:51PM +01, Ian Jackson wrote: > > As I wrote in private email: > > > > For gbp and unapplied, I think it would be very sensible to check that >

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-20 Thread Sean Whitton
control: tag -1 +patch Hello, On Fri 19 Jul 2019 at 10:51PM +01, Ian Jackson wrote: > For gbp and unapplied, I think it would be very sensible to check that > the upstream files are treesame in master and upstream. (For gbp, > ignoring /.gitignore) > > I think this may be a common user error

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-20 Thread Sean Whitton
Hello, On Sat 20 Jul 2019 at 03:15PM +01, Sean Whitton wrote: > I assume the place to look for how to do this would be inside dgit? I > can't immediately see a "very easy" implementation. Oh, presumably you meant some filtering of the output of `git diff-tree --numstat $upstream $branch`? --

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-20 Thread Sean Whitton
Hello, On Fri 19 Jul 2019 at 10:51PM +01, Ian Jackson wrote: > Package: git-debpush > Version: 9.3 > User: d...@packages.debian.org > Usertags: rsn > > As I wrote in private email: > > For gbp and unapplied, I think it would be very sensible to check that > the upstream files are treesame in

Bug#932476: git-debpush gbp/unapplied upstream tree check

2019-07-19 Thread Ian Jackson
Package: git-debpush Version: 9.3 User: d...@packages.debian.org Usertags: rsn As I wrote in private email: For gbp and unapplied, I think it would be very sensible to check that the upstream files are treesame in master and upstream. (For gbp, ignoring /.gitignore) I think this may be a