X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.7;h=6c74f40d46b4ed789b234e155f17dec0cf38ba54;hp=a3ea84cc479823966eaf910e6ce109117bfd4c8e;hb=076a8ac565082e73b3bae409df4492701654d74a;hpb=cfd5e47a4a0d485c2cbb93cccad40e8086de52ea diff --git a/dgit.7 b/dgit.7 index a3ea84cc..6c74f40d 100644 --- a/dgit.7 +++ b/dgit.7 @@ -53,9 +53,9 @@ the dgit/suite branch. dgit expects repos that it works with to have a .B dgit -remote. This refers to the well-known dgit-repos location -(currently, the dgit-repos project on Alioth). dgit fetch updates -the remote tracking branch for dgit/suite. +remote. This refers to the well-known dgit-repos location (on a +dedicated Debian VM). dgit fetch updates the remote tracking branch +for dgit/suite. dgit does not (currently) represent the orig tarball(s) in git. The orig tarballs are downloaded (by dgit clone) into the parent @@ -149,5 +149,27 @@ Of course it may also be that the differences are due to build system bugs, which cause unintended files to end up in the source package. dgit will notice this and complain. You may have to fix these bugs before you can unify your existing git history with dgit's. +.LP +.SH PROBLEMS WITH PACKAGE CLEAN TARGETS ETC. +A related problem is unexpected behaviour by a package's +.B clean +target. +If a package's rules +remove or modify files which are distributed in the package, +or simply forgets to remove certain files, +dgit will complain that the tree is dirty. +.LP +The solution is to use +.BR "dgit -wg" " aka " "--clean=git" , +which instructs dgit to use git clean instead of the package's +build target, +along with perhaps +.B git reset --hard +before each build. +.LP +This is 100% reliable, but has the downside +that if you forget to git add or to commit, and then use +.BR "dgit -wg" " or " "git reset --hard" , +your changes may be lost. .SH SEE ALSO \fBdgit\fP(1).