On Thu, Dec 09, 2010 at 10:21:37AM -0800, Russ Allbery wrote: > Guido Günther <[email protected]> writes: > > > Hi Russ, > > > On Thu, Dec 09, 2010 at 12:24:54AM +0100, Thomas Preud'homme wrote: > > >> dpkg-source now already ignore .git* so there is no need for > >> configuring diffignore and tarignore in git-pbuilder. Besides, the > >> actual tarignore and diffignore in dpkg-source ignore more things (e.g. > >> debian/source/local-options) than the overriding ignores from > >> git-pbuilder. > > >> At least, if these ignores should stay, git-pbuilder should use > >> --extend-diff-ignore instead of -i to not override the ignore in > >> dpkg-source. > > > Since this affects git-bbuilder directly: Any comments on this one? > > The limitation of the ignore rule inside git-pbuilder to only the > Git-related files was intentional, since it avoids ignoring files that may > come from upstream and are unrelated to the local Debian packaging. > Unlike dpkg, git-pbuilder knows that it's running under Git and therefore > doesn't need to ignore metadata files from other revision control systems > in order to keep the VCS files from leaking into the build and can > therefore preserve local changes to VCS files that were included in the > upstream distribution for some reason. > > The problem with trying to do that, of course, is things like > local-options, so maybe it isn't as good of an idea as I thought it was in > the first place. > > I could just go back to not passing in any ignore options at all and let > the dpkg-source default take effect. It makes things more annoying in > some edge cases, but they may be so edge that no one will run into them.
A compromise could be an env var that allows to turn off (or turn on) the filter. -- Guido -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
