Bug#973881: Result of 'git debrebase make-patches' with 'diff.noprefix' git config confuses dgit
Didier 'OdyX' Raboud writes ("Bug#973881: Result of 'git debrebase
make-patches' with 'diff.noprefix' git config confuses dgit"):
> after toggling a git diff option globally with:
> git config --global diff.noprefix true
>
> I noticed that dgit (at least build-source, but others too) started to fail
> comparing patches-applied with patches-unapplied trees.
How unfortunate.
> I'm reporting this against git debrebase, because it seems to me that git
> debrebase ought to always format patches in a known-to-work format, no matter
> what the user has configured for his personal git usage.
Quite so.
Unfortunately it is not so easy to do this right. We have a private
tree but must choose which git config settings to inherit and which to
override.
This mostly works, but for settings where
git config --local --add $key
breaks, it doesn't. We have to manually add those with
git config diff.noprefix 0
(in this case).
Thanks for the report!
Ian.
--
Ian JacksonThese opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
Bug#973881: Result of 'git debrebase make-patches' with 'diff.noprefix' git config confuses dgit
Control: retitle -1 Result of 'git debrebase make-patches' with 'diff.noprefix' git config confuses dpkg-buildpackage Le lundi, 9 novembre 2020, 02.31:38 h CET Sean Whitton a écrit : > On Fri 06 Nov 2020 at 03:19PM +01, Didier 'OdyX' Raboud wrote: > > Package: git-debrebase > > Version: 9.12 > > Severity: normal > > > > Hello there, > > > > after toggling a git diff option globally with: > > git config --global diff.noprefix true > > > > I noticed that dgit (at least build-source, but others too) started to > > fail > > comparing patches-applied with patches-unapplied trees. > > > > I'm reporting this against git debrebase, because it seems to me that git > > debrebase ought to always format patches in a known-to-work format, no > > matter what the user has configured for his personal git usage. > > Could you provide steps to reproduce, please? Sure. Sorry, I should have done this upfront. Here goes; in a debian:sid docker image: # apt update && apt upgrade -y && apt install -y devscripts git-debrebase # git config --global diff.noprefix true # git clone https://salsa.debian.org/printing-team/cups-filters.git # cd cups-filters # gbp buildpackage -S -d # git debrebase; git debrebase conclude; git debrebase make-patches # dpkg-buildpackage -S The error is: dpkg-buildpackage: info: source package cups-filters dpkg-buildpackage: info: source version 1.28.5-1 dpkg-buildpackage: info: source distribution unstable dpkg-buildpackage: info: source changed by Didier Raboud dpkg-source --before-build . dpkg-source: error: none of the filenames in ---/+++ are valid in diff 'cups-filters/debian/patches/0001-Force-set-INITDIR-in-configure.ac-instead-of-relying.patch' (line 13) dpkg-buildpackage: error: dpkg-source --before-build . subprocess returned exit status 255 So it seems that it's unrelated with `dgit`; dpkg-buildpackage -S already gets confused > If you could give us a particular commit hash to check out of a > repository somewhere to start with, that would be good. cups-filters' above is 4a6df4ccff9e03623778011ab6554194efc1f325 Best regards, OdyX signature.asc Description: This is a digitally signed message part.
Bug#973881: Result of 'git debrebase make-patches' with 'diff.noprefix' git config confuses dgit
Hello, On Fri 06 Nov 2020 at 03:19PM +01, Didier 'OdyX' Raboud wrote: > Package: git-debrebase > Version: 9.12 > Severity: normal > > Hello there, > > after toggling a git diff option globally with: > git config --global diff.noprefix true > > I noticed that dgit (at least build-source, but others too) started to fail > comparing patches-applied with patches-unapplied trees. > > I'm reporting this against git debrebase, because it seems to me that git > debrebase ought to always format patches in a known-to-work format, no matter > what the user has configured for his personal git usage. Could you provide steps to reproduce, please? If you could give us a particular commit hash to check out of a repository somewhere to start with, that would be good. -- Sean Whitton signature.asc Description: PGP signature
Bug#973881: Result of 'git debrebase make-patches' with 'diff.noprefix' git config confuses dgit
Package: git-debrebase Version: 9.12 Severity: normal Hello there, after toggling a git diff option globally with: git config --global diff.noprefix true I noticed that dgit (at least build-source, but others too) started to fail comparing patches-applied with patches-unapplied trees. I'm reporting this against git debrebase, because it seems to me that git debrebase ought to always format patches in a known-to-work format, no matter what the user has configured for his personal git usage. Cheers, OdyX
