Hello,
On 16/02/2022 14:39, Andrej Shadura wrote:
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.
Here’s a log of a session in which I reproduced the issue from the
scratch. Sorry for the line wrapping.
andrewsh@nuevo /t/test-gbp> dgit clone hello
canonical suite name for unstable is sid
starting new git history
last upload to archive: NO git hash
% Total % Received % Xferd Average Speed Time Time Time
Current
Dload Upload Total Spent Left
Speed
100 708k 100 708k 0 0 1868k 0 --:--:-- --:--:-- --:--:--
1865k
% Total % Received % Xferd Average Speed Time Time Time
Current
Dload Upload Total Spent Left
Speed
100 6132 100 6132 0 0 1174 0 0:00:05 0:00:05 --:--:--
1436
dpkg-source: info: extracting hello in hello-2.10
dpkg-source: info: unpacking hello_2.10.orig.tar.gz
dpkg-source: info: unpacking hello_2.10-2.debian.tar.xz
synthesised git commit from .dsc 2.10-2
HEAD is now at a72f60c8c312 hello (2.10-2) unstable; urgency=medium
dgit ok: ready for work in hello
andrewsh@nuevo /t/test-gbp> cd hello
andrewsh@nuevo /t/t/hello (dgit/sid)> gbp pq import
gbp:info: Trying to apply patches at
'a72f60c8c31288e3e3715d0409c74faee35b3b18'
gbp:info: 0 patches listed in 'debian/patches/series' imported on
'patch-queue/dgit/sid'
andrewsh@nuevo /t/t/hello (patch-queue/dgit/sid)> echo super important
change >> README
andrewsh@nuevo /t/t/hello (patch-queue/dgit/sid)> git diff
diff --git a/README b/README
index cf22cf9d3e7f..4353e9e0eef3 100644
--- a/README
+++ b/README
@@ -74,3 +74,4 @@ order to be a canonical example of a GNU package.
Many people have
contributed; please see the AUTHORS and ChangeLog files.
GNU Hello is free software. See the file COPYING for copying conditions.
+super important change
andrewsh@nuevo /t/t/hello (patch-queue/dgit/sid)> git commit -a -m "A
super important change"
[patch-queue/dgit/sid 61571bd130b0] A super important change
1 file changed, 1 insertion(+)
andrewsh@nuevo /t/t/hello (patch-queue/dgit/sid)> gbp pq export
gbp:info: On 'patch-queue/dgit/sid', switching to 'dgit/sid'
gbp:info: Generating patches from git (dgit/sid..patch-queue/dgit/sid)
andrewsh@nuevo /t/t/hello (dgit/sid)> git status
On branch dgit/sid
Untracked files:
(use "git add <file>..." to include in what will be committed)
debian/patches/
nothing added to commit but untracked files present (use "git add" to track)
andrewsh@nuevo /t/t/hello (dgit/sid)> git add debian/patches/
andrewsh@nuevo /t/t/hello (dgit/sid)> git commit -a -m "Add a patch for
a super important change"
[dgit/sid 67da756416d3] Add a patch for a super important change
2 files changed, 18 insertions(+)
create mode 100644 debian/patches/0001-A-super-important-change.patch
create mode 100644 debian/patches/series
andrewsh@nuevo /t/t/hello (dgit/sid)> dgit build-source
Format `3.0 (quilt)', need to check/update patch stack
dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
examining quilt state (multiple patches, gbp mode)
dgit: base trees orig=d05377ef3e3d210f0b5c o+d/p=1c1466eaf095c2031ea6
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
andrewsh@nuevo /t/t/hello (dgit/sid)>
--
Cheers,
Andrej