| Message ID | pull.943.git.git.1610124896385.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 28310380a510feb324c84e5abd07e8e100fefd00 |
| Headers | show |
| Series | doc: remove "directory cache" from man pages | expand |
Hi Utku, On Fri, Jan 08, 2021 at 04:54:56PM +0000, Utku Gultopu via GitGitGadget wrote: > From: Utku Gultopu <ugultopu@gmail.com> > > "directory cache" (or "directory cache index", "cache") are obsolete > terms which have been superseded by "index". Keeping them in the > documentation may be a source of confusion. This commit replaces > them with the current term, "index", on man pages. This patch looks good to me. There is another mention of the old-style "directory cache" in the user manual (Documentation/user-manual.txt) which could probably be removed: Note that in older documentation you may see the index called the "current directory cache" or just the "cache". It has three important properties: Thanks, Taylor
Hi Taylor, I left that one on purpose. I initially thought that "Documentation/user-manual.txt" was just an outdated, "dead" file that wasn't being updated anymore and Pro Git 2 was the de-facto user manual now. Hence, I left it there so that it would provide historical context. However, after having a look at the history of it, I realize that it is not a dead file at all. Also a web search for "git user manual" returns it as the first result, so I understand that it is still very much relevant. On the other hand, the document clearly states that the terms "directory cache" and "cache" have been obsoleted by "index", so there is no source of confusion there. On the man pages, there was, which was the reason I felt the need to make this change. I thought that keeping at least one definition of "directory cache" (where this definition clearly states that it is an obsolete term for "index") would be helpful. So what are your thoughts about it? If you think it is better to remove it, please let me know and I will remove it. Best > On Jan 8, 2021, at 1:32 PM, Taylor Blau <me@ttaylorr.com> wrote: > > Hi Utku, > > On Fri, Jan 08, 2021 at 04:54:56PM +0000, Utku Gultopu via GitGitGadget wrote: >> From: Utku Gultopu <ugultopu@gmail.com> >> >> "directory cache" (or "directory cache index", "cache") are obsolete >> terms which have been superseded by "index". Keeping them in the >> documentation may be a source of confusion. This commit replaces >> them with the current term, "index", on man pages. > > This patch looks good to me. There is another mention of the old-style > "directory cache" in the user manual (Documentation/user-manual.txt) > which could probably be removed: > > Note that in older documentation you may see the index called the > "current directory cache" or just the "cache". It has three important > properties: > > Thanks, > Taylor
On Fri, Jan 08, 2021 at 02:51:05PM -0500, Utku wrote: > On the other hand, the document clearly states that the terms "directory > cache" and "cache" have been obsoleted by "index", so there is no source > of confusion there. On the man pages, there was, which was the reason I > felt the need to make this change. I thought that keeping at least one > definition of "directory cache" (where this definition clearly states > that it is an obsolete term for "index") would be helpful. > > So what are your thoughts about it? If you think it is better to remove > it, please let me know and I will remove it. I think that is a good reason to leave it as-is. Since you hadn't mentioned it in the patch text, I was wondering whether it was an omission, or you had intended to leave it that way. This patch looks good to me as-is. Thanks, Taylor
Taylor Blau <me@ttaylorr.com> writes: > On Fri, Jan 08, 2021 at 02:51:05PM -0500, Utku wrote: >> On the other hand, the document clearly states that the terms "directory >> cache" and "cache" have been obsoleted by "index", so there is no source >> of confusion there. On the man pages, there was, which was the reason I >> felt the need to make this change. I thought that keeping at least one >> definition of "directory cache" (where this definition clearly states >> that it is an obsolete term for "index") would be helpful. >> >> So what are your thoughts about it? If you think it is better to remove >> it, please let me know and I will remove it. > > I think that is a good reason to leave it as-is. Since you hadn't > mentioned it in the patch text, I was wondering whether it was an > omission, or you had intended to leave it that way. > > This patch looks good to me as-is. Yup, I agree with the reasoning to keep the "older documentation may say dircache". Will queue. Thanks.
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index cbcf5263dd0..0a3b5265b34 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -23,9 +23,8 @@ SYNOPSIS DESCRIPTION ----------- -This merges the file listing in the directory cache index with the -actual working directory list, and shows different combinations of the -two. +This merges the file listing in the index with the actual working +directory list, and shows different combinations of the two. One or more of the options below may be used to determine the files shown: diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 1489cb09a09..2853f168d97 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -30,9 +30,8 @@ SYNOPSIS DESCRIPTION ----------- -Modifies the index or directory cache. Each file mentioned is updated -into the index and any 'unmerged' or 'needs updating' state is -cleared. +Modifies the index. Each file mentioned is updated into the index and +any 'unmerged' or 'needs updating' state is cleared. See also linkgit:git-add[1] for a more user-friendly way to do some of the most common operations on the index.