Bug#1005873: [git-buildpackage/master] pq: Check if repo is clean before importing patches
Paul Gevers writes ("Bug#1005873: [git-buildpackage/master] pq: Check if repo
is clean before importing patches"):
> Control: severity -1 serious
...
> Seems like the autopkgtest of dgit is now blocking progression of
> git-buildpackage related to this change.
Thanks for escalating this. I had dropped the ball. I have uploaed a
fixed version of dgit which I hope will sort this out.
Thanks,
Ian.
--
Ian JacksonThese opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
Bug#1005873: [git-buildpackage/master] pq: Check if repo is clean before importing patches
Control: severity -1 serious
Hi,
On Thu, 17 Feb 2022 10:30:31 + Ian Jackson
wrote:
Sean Whitton writes ("Bug#1005873: [git-buildpackage/master] pq: Check if repo is
clean before importing patches"):
> On Wed 16 Feb 2022 at 02:39PM +01, Andrej Shadura wrote:
> > gbp:error: Use --ignore-new to ignore.
> > dgit: failed command: sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import
>
> Sounds like dgit should start passing --ignore-new in this case?
Well, maybe. If done via the command line, dgit ought to do some kind
of dance to work with old gbp, which compplicates matters. But maybe
dgit should provide a .git/gbp.conf in the playtree, which could be
used to override any other troublesome settings.
The difficulty here is just the .pc directory. Perhaps dgit ought to
remove it or move it aside, before running gbp pq.
If we did that then we might want to explicitly *enable* the new
checks.
Seems like the autopkgtest of dgit is now blocking progression of
git-buildpackage related to this change.
Paul
OpenPGP_signature
Description: OpenPGP digital signature
Bug#1005873: [git-buildpackage/master] pq: Check if repo is clean before importing patches
Sean Whitton writes ("Bug#1005873: [git-buildpackage/master] pq: Check if repo
is clean before importing patches"):
> On Wed 16 Feb 2022 at 02:39PM +01, Andrej Shadura wrote:
> > gbp:error: Use --ignore-new to ignore.
> > dgit: failed command: sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import
>
> Sounds like dgit should start passing --ignore-new in this case?
Well, maybe. If done via the command line, dgit ought to do some kind
of dance to work with old gbp, which compplicates matters. But maybe
dgit should provide a .git/gbp.conf in the playtree, which could be
used to override any other troublesome settings.
The difficulty here is just the .pc directory. Perhaps dgit ought to
remove it or move it aside, before running gbp pq.
If we did that then we might want to explicitly *enable* the new
checks.
Ian.
--
Ian JacksonThese opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
Bug#1005873: [git-buildpackage/master] pq: Check if repo is clean before importing patches
Hello, On Wed 16 Feb 2022 at 02:39PM +01, Andrej Shadura wrote: > Hi, > > On Fri, 11 Feb 2022 14:30:50 +0100 (CET) Guido Günther > wrote: >> tag 1005321 pending >> thanks >> >> Date: Fri Feb 11 11:35:01 2022 +0100 >> Author: Guido Günther >> Commit ID: 8db5af7326c581014ca07dcd98beac30f2c90d4f >> Commit URL: >> https://git.sigxcpu.org/cgit/git-buildpackage//commit/?id=8db5af7326c581014ca07dcd98beac30f2c90d4f >> Patch URL: >> https://git.sigxcpu.org/cgit/git-buildpackage//patch/?id=8db5af7326c581014ca07dcd98beac30f2c90d4f >> >> pq: Check if repo is clean before importing patches > > Defaulting to --no-ignore-new breaks dgit --gbp push-source when there > are patches. As a workaround, I had to stick pq.ignore-new = False into > my gbp.conf: > > $ dgit push-source > Format `3.0 (quilt)', need to check/update patch stack > canonical suite name is bullseye-backports > dgit: split brain (separate dgit view) may be needed (--quilt=gbp). > examining quilt state (multiple patches, gbp mode) > dgit: base trees orig=a2b0298f5ffa80788851 o+d/p=17982c3db326770dc1b2 > dgit: quilt differences: src: == orig ## gitignores: == orig == > dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p > dgit view: creating patches-applied version using gbp pq > gbp:error: You have uncommitted changes in your source tree: > gbp:error: On branch dgit-view > Untracked files: >(use "git add ..." to include in what will be committed) > .pc/ > > nothing added to commit but untracked files present (use "git add" to track) > > gbp:error: Use --ignore-new to ignore. > dgit: failed command: sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import Sounds like dgit should start passing --ignore-new in this case? -- Sean Whitton signature.asc Description: PGP signature
Bug#1005873: [git-buildpackage/master] pq: Check if repo is clean before importing patches
Hi, On Fri, 11 Feb 2022 14:30:50 +0100 (CET) Guido Günther wrote: tag 1005321 pending thanks Date: Fri Feb 11 11:35:01 2022 +0100 Author: Guido Günther Commit ID: 8db5af7326c581014ca07dcd98beac30f2c90d4f Commit URL: https://git.sigxcpu.org/cgit/git-buildpackage//commit/?id=8db5af7326c581014ca07dcd98beac30f2c90d4f Patch URL: https://git.sigxcpu.org/cgit/git-buildpackage//patch/?id=8db5af7326c581014ca07dcd98beac30f2c90d4f pq: Check if repo is clean before importing patches Defaulting to --no-ignore-new breaks dgit --gbp push-source when there are patches. As a workaround, I had to stick pq.ignore-new = False into my gbp.conf: $ dgit push-source Format `3.0 (quilt)', need to check/update patch stack canonical suite name is bullseye-backports dgit: split brain (separate dgit view) may be needed (--quilt=gbp). examining quilt state (multiple patches, gbp mode) dgit: base trees orig=a2b0298f5ffa80788851 o+d/p=17982c3db326770dc1b2 dgit: quilt differences: src: == orig ## gitignores: == orig == dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p dgit view: creating patches-applied version using gbp pq gbp:error: You have uncommitted changes in your source tree: gbp:error: On branch dgit-view Untracked files: (use "git add ..." to include in what will be committed) .pc/ nothing added to commit but untracked files present (use "git add" to track) gbp:error: Use --ignore-new to ignore. dgit: failed command: sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import dgit: error: subprocess failed with error exit status 1 ! Push failed, before we got started. ! You can retry the push, after fixing the problem, if you like. -- Cheers, Andrej
