Hi,
On Fri, 11 Feb 2022 14:30:50 +0100 (CET) Guido Günther <a...@sigxcpu.org>
wrote:
tag 1005321 pending
thanks
Date: Fri Feb 11 11:35:01 2022 +0100
Author: Guido Günther <a...@sigxcpu.org>
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 <file>..." 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
