control: retitle -1 dgit: sometimes ignores configured clean-mode Hello Ian,
On Wed 28 Nov 2018 at 06:23pm GMT, Ian Jackson wrote: > I tried this: > > git clone https://salsa.debian.org/haskell-team/git-annex > git reset --hard c6dda1ee~1 > git-cherry-pick -n c6dda1ee > git-deborig > dgit --build-products-dir=.. --include-dirty build-source > > That left the situation you describe, with debian/patches and .pc > created. > > After that, > > dgit --build-products-dir=.. -wgf quilt-fixup > => complaint from dgit that the tree is dirty > > git commit -m X > dgit --build-products-dir=.. -wgf quilt-fixup > => deletes the .pc and debian/patches, success > > But, if I restore that state I can repro your message like this: > > git commit -m X > dgit --build-products-dir=.. -wddn quilt-fixup > => error you quote > > Is it possible you were using an earlier version of dgit ? dgits > before 8.0 do not detect and fail on untracked files. To eliminate this (unlikely due to my aggressive config management ;)) possibility, I just reproduced the problem again, using dgit 8.1 from stretch-backports. Here are my results. My config contains [dgit "default"] # just clean in the most aggressive way dgit knows how clean-mode = git-ff but I get the following results: dgit sbuild => the unhelpful error that prompted me to report this bug dgit -wgf sbuild => complaint from dgit that the tree is dirty So, in fact, the bug seems to be that dgit is sometimes ignoring my configured clean-mode. My full ~/.gitconfig on this machine is here: https://git.spwhitton.name/dotfiles/tree/.gitconfig?h=zephyr -- Sean Whitton
signature.asc
Description: PGP signature