X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dgit.1;h=c3dd420bdfc6bd92cefcee407f1b256343e61559;hb=06d712df73af99b1655315d71db571c7315a15c1;hp=4521cd30771016bba1037f89f7857800b9132649;hpb=e629dfe6f8766b23c13613b27c6f0d7cbae346ab;p=dgit.git diff --git a/dgit.1 b/dgit.1 index 4521cd30..c3dd420b 100644 --- a/dgit.1 +++ b/dgit.1 @@ -538,7 +538,12 @@ This will delete all files which are not tracked by git. options other than dpkg-source are useful when the package's clean target is troublesome, or to avoid needing the build-dependencies. -.TP + +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. +p.TP .BR --clean=git-ff " | " -wgf Use .BR "git clean -xdff" @@ -591,6 +596,32 @@ the build-dependencies are not checked .BR -d to dpkg-buildpackage), which violates policy, but may work in practice. + +The rules clean target will only be run if it is needed: +when dgit is going to build source or binary packages +from your working tree, +rather than from your git branch +(for example because of --include-dirty +or because the binary package build uses your working tree). + +In all cases, +dgit will check that there are (after rules clean, if applicable) no +untracked un-ignored files, +in case these are files you forgot to git add. +(Except that this check is not done +for a `3.0 (quilt)' package +when dgit has to apply patches, dirtily, to the working tree.) +If your package does not have a good .gitignore +you will probably need --clean=dpkg-source,no-check aka -wdn. +.TP +.BR --clean=dpkg-source "[" -d "]" ,no-check " | " -wdn " | " -wddn +Like --clean=dpkg-source, but +does not care about untracked un-ignored files. +.TP +.BR --clean=dpkg-source "[" -d "]" ,all-check " | " -wda " | " -wdda +Like --clean=dpkg-source, but +fails even on ignored untracked files. +This could perhaps be used to detect bugs in your rules clean target. .TP .BR -N " | " --new The package is or may be new in this suite. Without this, dgit will