gitignore.txt: fix slash-rules example
PATCH 1/1 gitignore.txt: fix slash-rules example
From: Timofey Vasenin <[email protected]>
Fix an apparent typo, introduced in:1a58bad014 (gitignore.txt: make slash-rules more readable, 2019-06-04)
---
gitignore.txt: fix slash-rules example
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1720%2Ftvasenin%2Ftvasenin%2Fgitignore-slash-rules-example-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1720/tvasenin/tvasenin/gitignore-slash-rules-example-fix-v1
Pull-Request: https://github.com/git/git/pull/1720
Documentation/gitignore.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/gitignore.txt +1 -1
@@ -100,7 +100,7 @@ PATTERN FORMAT will only match directories, otherwise the pattern can match both files and directories. - - For example, a pattern `doc/frotz/` matches `doc/frotz` directory, + - For example, a pattern `/doc/frotz/` matches `doc/frotz` directory, but not `a/doc/frotz` directory; however `frotz/` matches `frotz` and `a/frotz` that is a directory (all paths are relative from the `.gitignore` file).
base-commit: 3e4a232f6e3bd3b7dd920bb07b21cf1c8b4e1a7f
Signature · 1 line
gitgitgadget
Quoted 10 lines · Timofey Vasenin via GitGitGadget
From: Timofey Vasenin <[email protected]>
Fix an apparent typo, introduced in:
1a58bad014(gitignore.txt: make slash-rules more readable, 2019-06-04)
...Documentation/gitignore.txt +0
-0
Documentation/gitignore.txt PATTERN FORMAT · line 106
Quoted 8 lines
Documentation/gitignore.txt +1
-1@@ -100,7 +100,7 @@ PATTERN FORMAT will only match directories, otherwise the pattern can match both files and directories. - - For example, a pattern `doc/frotz/` matches `doc/frotz` directory, + - For example, a pattern `/doc/frotz/` matches `doc/frotz` directory, but not `a/doc/frotz` directory; however `frotz/` matches `frotz` and `a/frotz` that is a directory (all paths are relative from the `.gitignore` file).
Are you sure this is a typo?
The text added by the same commit (taken from "git show 1a58bad014") has this passage:
+ - The pattern doc/frotz and /doc/frotz have the same effect
+ in any `.gitignore` file. In other words, a leading slash + is not relevant if there is already a middle slash in + the pattern.
So, if your updated /doc/frotz/ works as described (i.e. match doc/frotz but not a/doc/frotz), then the original doc/frotz/ should behave exactly the same way, no? If you have a good reason to believe that doc/frotz/ described there should be /doc/frotz/ instead, then you need to also update that "have the same effect" paragraph.
There should already be an existing test that checks it somewhere under t/; finding one is left as an exercise (or punishment) to readers ;-).
It is easy to construct a test case from scratch.
$ mkdir -p doc/frotz/ a/doc/frotz/
$ >doc/frotz/foo
$ >a/doc/frotz/bar
$ echo doc/frotz >.gitignore
$ git check-ignore -v doc/frotz/foo a/doc/frotz/bar
.gitignore:1:doc/frotz doc/frotz/fooIt seems that doc/frotz seems to work exactly as described, matching with doc/frotz/foo but not with a/doc/frotz/bar, without a leading slash, thanks to a slash in the middle.
So...