On Sat 10 Dec 2022 at 07:26PM GMT, Ian Jackson wrote:
> With my fix, and with this workaround:
>
> zealot:xref-el> git checkout 885455a && dgit -wgf --quilt=nofix quilt-fixup
> HEAD is now at 885455a d/changelog : update timestamp, mark ready for upload
> Format `3.0 (quilt)', need to check/update patch stack
> examining quilt state (multiple patches, nofix mode)
> gzip: warning: GZIP environment variable is deprecated; use an alias or script
> dgit: base trees orig=095082ae50ef2cf481ba o+d/p=095082ae50ef2cf481ba
> dgit: quilt differences: src: ## orig == gitignores: == orig ==
> dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p
> starting quiltify (multiple patches, nofix mode)
>
> dgit: error: quilt fixup required but quilt mode is `nofix'
> dgit: HEAD commit 885455aaddb1d8290be5517bfd1835cbe4f2ccf6 differs from tree
> implied by debian/patches (tree object
> 095082ae50ef2cf481ba62d0186652fe64fc8963)
> zealot:xref-el>
Are you sure? I upgraded to dgit from sid, hacked /usr/bin/dgit
according to your patch, and cannot reproduce:
~/src/xref-el % dgit -wgf --quilt=nofix quilt-fixup
Format `3.0 (quilt)', need to check/update patch stack
examining quilt state (multiple patches, nofix mode)
dgit: base trees orig=f7407733064577f7539a o+d/p=f7407733064577f7539a
dgit: quilt differences: src: == orig == gitignores: == orig ==
dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p
starting quiltify (multiple patches, nofix mode)
quiltify linearisation planning successful, executing...
nothing quilty to commit, ok.
~/src/xref-el % g co 885455a && dgit -wgf --quilt=nofix quilt-fixup
HEAD is now at 885455a d/changelog : update timestamp, mark ready for upload
Format `3.0 (quilt)', need to check/update patch stack
examining quilt state (multiple patches, nofix mode)
dgit: base trees orig=f7407733064577f7539a o+d/p=f7407733064577f7539a
dgit: quilt differences: src: == orig == gitignores: == orig ==
dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p
starting quiltify (multiple patches, nofix mode)
quiltify linearisation planning successful, executing...
nothing quilty to commit, ok.
~/src/xref-el % g s
HEAD detached at 885455a
nothing to commit, working tree clean
--
Sean Whitton
