Hello, On Sun 06 Jan 2019 at 01:13pm GMT, Ian Jackson wrote:
> I tried quite hard to investigate this allegation that the clean mode > was honoured differently according to whether it was specified in the > git config, or on the command line; with no success. I also traced > the code. I think you are mistaken on that. Fair enough! I am able to reproduce as many times as you like, but I'm not going to send you my root filesystem image :) > However, I did repro the original poor error message like this: > > git clean -xdff > git reset --hard c6dda1ee~1 > git-cherry-pick -n c6dda1ee > git-deborig ||: > dgit -wddn --include-dirty build-source > git commit -m X > dgit -D -v7.20181105-1 -wgf sbuild -c build > > The problem is that dgit sbuild nowadays doesn't clean things at all. > As discussed in the manpage: > > dgit will only actually clean the tree if it needs to (because it > needs to build the source package or binaries from your working > tree). Otherwise any untracked files will be simply ignored. > > But this is wrong, in fact, because it does "need to" or things go > wrong. Earlier I wrote a case analysis of clean modes here: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910705#56 > > But I never completed the impleentation of the `ACTION ON SOURCE > BUILD' entries for git/git-ff. > > I have now done that and the result is in my tree being tested. > With my current master, my repro above produces this: > > Would remove .pc/ > Would remove debian/patches/ > > dgit: error: tree contains uncommited, untracked, unignored files > dgit: You can use --clean=git[-ff],always (-wga/-wgfa) to delete them. > > And using -wgfa indeed makes it delete the files, and then succeed. How about the "opt to disregard"? -- Sean Whitton
signature.asc
Description: PGP signature
