Re: [PATCH v7 1/4] gitfaq: files in .gitignore are tracked
From: Son Luong Ngoc <hidden>
Date: 2020-05-15 17:32:20
Hey folks,
quoted hunk
Add issue in 'Common Issues' section which addresses the problem of Git tracking files/paths mentioned in '.gitignore'. Signed-off-by: Shourya Shukla <redacted> --- Documentation/gitfaq.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 1cf83df118..11d9bac859 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt@@ -223,6 +223,16 @@ a file checked into the repository which is a template or set of defaults which can then be copied alongside and modified as appropriate. This second, modified file is usually ignored to prevent accidentally committing it. +[[files-in-.gitignore-are-tracked]]
This does not work for older xmlto(centos6) for whatever reason.
# make doc
...
# xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl -m
manpage-base-url.xsl man gitfaq.xml
xmlto: /<git-dir>/Documentation/gitfaq.xml does not validate (status 3)
xmlto: Fix document syntax or use --skip-validation option
/<git-dir>/Documentation/gitfaq.xml:3: element refentry: validity
error : Element refentry content does not follow the DTD, expecting
(beginpage? , indexterm* , refentryinfo? , refmeta? , (remark | link |
olink | ulink)* , refnamediv+ , refsynopsisdiv? , (refsect1+ |
refsection+)), got (refmeta refnamediv refsynopsisdiv refsect1
refsect1 refsect1 refsect1 variablelist refsect1 refsect1 )
Build went fine on Centos7 and Centos8 though. I ran a quick sed to temporarily fix the problem
sed -i 's/files-in-\.gitignore/files-in-gitignore/g' Documentation/gitfaq.txt
But I suggest to just remove the period from this heading.
+I asked Git to ignore various files, yet they are still tracked:: + A `gitignore` file ensures that certain file(s) which are not + tracked by Git remain untracked. However, sometimes particular + file(s) may have been tracked before adding them into the + `.gitignore`, hence they still remain tracked. To untrack and + ignore files/patterns, use `git rm --cached <file/pattern>` + and add a pattern to `.gitignore` that matches the <file>. + See linkgit:gitignore[5] for details. + Hooks ----- -- 2.26.2
Cheers, Son Luong.