Package: dgit
Version: 4.1
Severity: normal

I must be doing something wrong, but I cannot get any of the documented
workflow in dgit-maint-gbp to work with a package in 3.0 (quilt),
patches-unapplied.

Starting from the current rssh source (debcheckout should get you the
same thing I'm working from), I've tried:

----

$ dgit gbp-build

dgit: Building, or cleaning with rules target, in patches-unapplied tree.
dgit: Have to apply the patches - making the tree dirty.
dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)

[...]
 debian/rules clean
dh clean
   dh_clean
gbp:error: You have uncommitted changes in your source tree:
gbp:error: On branch debian/master
Your branch is ahead of 'origin/debian/master' by 6 commits.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   Makefile.am
        deleted:    conf_convert.sh
        modified:   configure.ac
        modified:   main.c.in
        modified:   mkchroot.sh
        modified:   pathnames.h.in
        modified:   rssh.1
        modified:   rssh.conf.5
        modified:   rssh.conf.5.in
        modified:   rssh.conf.default
        modified:   rssh.h
        modified:   rssh_chroot_helper.c
        modified:   rsshconf.c
        modified:   util.c
        modified:   util.h

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        .pc/
        conf_convert

no changes added to commit (use "git add" and/or "git commit -a")

gbp:error: Use --git-ignore-new to ignore.
dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags 
'--git-builder=dpkg-buildpackage -i'\\'.git/ -I.git -nc -b' --git-cleaner=true 
'--git-prebuild=touch .git/dgit/origs-gen-ok .git/dgit/no-such-dir/ok'
dgit: subprocess failed with error exit status 1

---

I then tried with --git-ignore-new, but get:

[...]
gbp:info: Tarballs 'rssh_2.3.4.orig.tar.gz' not found at '../tarballs/'
gbp:info: Exporting 'HEAD' to '/home/eagle/dvl/debian/build-area/rssh-tmp'
gbp:info: Moving '/home/eagle/dvl/debian/build-area/rssh-tmp' to 
'/home/eagle/dvl/debian/build-area/rssh-2.3.4'
touch: cannot touch '.git/dgit/origs-gen-ok': No such file or directory
touch: cannot touch '.git/dgit/no-such-dir/ok': No such file or directory
gbp:error: Prebuild-hook 'touch .git/dgit/origs-gen-ok 
.git/dgit/no-such-dir/ok' failed: it exited with 1
dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags 
'--git-builder=dpkg-buildpackage -i'\\'.git/ -I.git -nc -b' --git-cleaner=true 
'--git-prebuild=touch .git/dgit/origs-gen-ok .git/dgit/no-such-dir/ok' 
--git-ignore-new
dgit: subprocess failed with error exit status 1

I get that same error when trying the other recommendation (--clean=git).

-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.14.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages dgit depends on:
ii  apt                               1.6~alpha5
ii  ca-certificates                   20170717
ii  coreutils                         8.28-1
ii  curl                              7.57.0-1
ii  devscripts                        2.17.11
ii  dpkg-dev                          1.19.0.4
ii  dput-ng [dput]                    1.15
ii  git [git-core]                    1:2.15.1-1
ii  git-buildpackage                  0.9.4
ii  libdpkg-perl                      1.19.0.4
ii  libjson-perl                      2.94-1
ii  liblist-moreutils-perl            0.416-1+b3
ii  libperl5.26 [libdigest-sha-perl]  5.26.1-3
ii  libtext-glob-perl                 0.10-1
ii  libtext-iconv-perl                1.7-5+b6
ii  libwww-perl                       6.29-1
ii  perl                              5.26.1-3

Versions of packages dgit recommends:
ii  openssh-client [ssh-client]  1:7.6p1-2

Versions of packages dgit suggests:
ii  sbuild  0.73.0-4

-- no debconf information

Reply via email to