Le mardi, 13 octobre 2020, 00.23:12 h CEST Ian Jackson a écrit : > Didier 'OdyX' Raboud writes: > > on various packaging repositories I routinely use dgit on, it has started > > to fail on me with the following error: > This is odd. dgit doesn't normally care much about branches.
It surprised me too
> > $ dgit pbuilder
> > Format `3.0 (quilt)', need to check/update patch stack
> > examining quilt state (multiple patches, linear mode)
> > gzip: warning: GZIP environment variable is deprecated; use an alias
> > or script dgit: base trees orig=cfd69559157d8cae3e6d
> > o+d/p=08391389eaf6c31ab9dc dgit: quilt differences: src: ## orig ##
> > gitignores: == orig == dgit: quilt differences: HEAD ==
> > o+d/p HEAD == o+d/p starting quiltify (multiple
> > patches, linear mode)
> > quiltify linearisation planning successful, executing...
> > error: pathspec 'master' did not match any file(s) known to git
> > dgit: failed command: git checkout -q master
> >
> > dgit: error: subprocess failed with error exit status 1
> >
> > Specifically, I'm running this dgit * command from a debian/master branch
> > (I will move to debian/main or debian/sid soon), with only the other
> > branches being upstream/latest and pristine-tar. I don't have a master
> > branch in these repositories at all.
>
> Can you please run the command again with (let's say) -DD ?
Hereby attached.
When I asked on IRC, Sean answered this:
spwhitton | OdyX: looks like it's unconditional
spwhitton | OdyX: at the end of the 'quiltify' sub
spwhitton | OdyX: should probably do something much more sophisticated
I hope it helps.
Cheers,
OdyX| git rev-parse --show-toplevel => `/home/didier/hack/cups-filters' | git config -z --get-regexp --local '.*' | git config -z --get-regexp --local '.*' | git config -z --get-regexp --global '.*' | git config -z --get-regexp --system '.*' format 3.0 (quilt), quilt mode linear Format `3.0 (quilt)', need to check/update patch stack | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header => `' + git diff --quiet HEAD #massaging# massage split -F. massage done 3 -b. format 3.0 (quilt), quilt mode linear | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header => `' + git diff --quiet HEAD | git clean -dn => `' checking for vendor-specific debian/patches/debian.series (Dpkg::Vendor `current vendor') checking for vendor-specific debian/patches/debian.series ((base) distro being accessed) checking for vendor-specific debian/patches/debian.series ((nominal) distro being accessed) | git rev-parse 'HEAD~0' => `4a6df4ccff9e03623778011ab6554194efc1f325' | git symbolic-ref -q HEAD => `refs/heads/debian/master' CD /home/didier/hack/cups-filters/.git/dgit/unpack CD work + env PATH=/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.30.3:/usr/local/share/perl/5.30.3:/usr/lib/x86_64-linux-gnu/perl5/5.30:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.30:/usr/share/perl/5.30:/usr/local/lib/site_perl:/usr/share/dgit:/home/didier/go/bin:/home/didier/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games git playtree-setup . + git reset -q --hard 4a6df4ccff9e03623778011ab6554194efc1f325 examining quilt state (multiple patches, linear mode) branch_is_gdr 4a6df4ccff9e03623778011ab6554194efc1f325... branch_is_gdr 4a6df4ccff9e03623778011ab6554194efc1f325 plain branch_is_gdr bd36058a8c0dcec376745c6bd398379b9f5a2a08 gdr make-patches YES + git reset -q --hard 4a6df4ccff9e03623778011ab6554194efc1f325 + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend | git rev-parse 'HEAD~0' => `4a6df4ccff9e03623778011ab6554194efc1f325' QF linkorigs bpd ., /home/didier/hack/cups-filters/../. ? QF linkorigs bpd .., /home/didier/hack/cups-filters/../.. ? QF linkorigs bpd … … + env GZIP=-1n tar -zcf './cups-filters_1.28.5-~~DGITFAKE.debian.tar.gz' -C /home/didier/hack/cups-filters debian/source/format debian/rules debian/control debian/changelog debian/patches gzip: warning: GZIP environment variable is deprecated; use an alias or script + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' CD fake | find -name .git -prune -print0 + env PATH=/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.30.3:/usr/local/share/perl/5.30.3:/usr/lib/x86_64-linux-gnu/perl5/5.30:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.30:/usr/share/perl/5.30:/usr/local/lib/site_perl:/usr/share/dgit:/home/didier/go/bin:/home/didier/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games git playtree-setup . + git checkout -f 4a6df4ccff9e03623778011ab6554194efc1f325 -- debian + git add -Af . | git write-tree => `46998c1a1f43cdc6d9dc8487c18fc8c0ba01d249' fake orig tree object 46998c1a1f43cdc6d9dc8487c18fc8c0ba01d249 CD .. + git reset -q --hard 4a6df4ccff9e03623778011ab6554194efc1f325 CD ../fake + git add -Af . | git write-tree => `a94ea9de5332aee29cadfb839c280bb1bc386795' fake o+d/p tree object 46998c1a1f43cdc6d9dc8487c18fc8c0ba01d249 CD ../work | git ls-tree --name-only -z 4a6df4ccff9e03623778011ab6554194efc1f325 => `ABOUT-NLS\x00AUTHORS\x00COPYING\x00ChangeLog\x00INSTALL\x00Makefile.am\x00Makefile.in\x00NEWS\x00README\x00aclocal.m4\x00autogen.sh\x00backend\x00banners\x00charset\x00compile\x00config.guess\x00config.h.in\x00config.rpath\x00config.sub\x00configure\x00configure.ac\x00cupsfilters\x00data\x00debian\x00depcomp\x00drv\x00filter\x00fontembed\x00install-sh\x00libcupsfilters.pc.in\x00libfontembed.pc.in\x00ln-srf\x00ltmain.sh\x00m4\x00mime\x00missing\x00ppd\x00scripting\x00test-driver\x00utils\x00' | git diff-tree -z --no-renames -r 46998c1a1f43cdc6d9dc8487c18fc8c0ba01d249 4a6df4ccff9e03623778011ab6554194efc1f325 => `:100644 100644 a127e378c7ffef35ec580726a8895ecccff699ad 6853a3394fa1fae05af289c2f31989f335dfd2e8 M\x00configure.ac\x00' quiltify_trees_differ 46998c1a1f43cdc6d9dc8487c18fc8c0ba01d249 4a6df4ccff9e03623778011ab6554194efc1f325 => 1 | git diff-tree -z --no-renames --name-only -r 4a6df4ccff9e03623778011ab6554194efc1f325 a94ea9de5332aee29cadfb839c280bb1bc386795 => `' quiltify_trees_differ 4a6df4ccff9e03623778011ab6554194efc1f325 a94ea9de5332aee29cadfb839c280bb1bc386795 => 0 | git diff-tree -z --no-renames --name-only -r 46998c1a1f43cdc6d9dc8487c18fc8c0ba01d249 a94ea9de5332aee29cadfb839c280bb1bc386795 => `configure.ac\x00' quiltify_trees_differ 46998c1a1f43cdc6d9dc8487c18fc8c0ba01d249 a94ea9de5332aee29cadfb839c280bb1bc386795 => 1 differences @dl ## ## == == == ==. dgit: base trees orig=46998c1a1f43cdc6d9dc o+d/p=a94ea9de5332aee29cad dgit: quilt differences: src: ## orig ## gitignores: == orig == dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p starting quiltify (multiple patches, linear mode) | git ls-tree --name-only 4a6df4ccff9e03623778011ab6554194efc1f325 -- debian/rules debian/control => `debian/control'... quiltify investigate 4a6df4ccff9e03623778011ab6554194efc1f325 | git diff-tree -z --no-renames --name-only 4a6df4ccff9e03623778011ab6554194efc1f325 a94ea9de5332aee29cadfb839c280bb1bc386795 => `' quiltify_trees_differ 4a6df4ccff9e03623778011ab6554194efc1f325 a94ea9de5332aee29cadfb839c280bb1bc386795 => 0 search finished hooray! quiltify linearisation planning successful, executing... + git checkout -q master error: pathspec 'master' did not match any file(s) known to git dgit: failed command: git checkout -q master dgit: error: subprocess failed with error exit status 1
signature.asc
Description: This is a digitally signed message part.
