{"thread":{"id":"56774","subject":"[PATCH 0/3] Documentation: change \"folder\" to \"directory\"","startedAt":"2021-10-24T17:09:42Z","lastAt":"2021-10-27T18:48:15Z","messageCount":9,"participants":["Martin Ågren","Bagas Sanjaya","Derrick Stolee","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"439495","messageId":"cover.1635094161.git.martin.agren@gmail.com","threadId":"56774","inReplyTo":null,"subject":"[PATCH 0/3] Documentation: change \"folder\" to \"directory\"","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2021-10-24T17:09:14Z","receivedAt":"2021-10-24T17:09:42Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"It is my understanding that we prefer \"directory\" over \"folder\" when\ndiscussing the file system concept. (Whereas \"folder\" is commonly used\nfor the GUI view of such a directory, or for an IMAP folder.)\n\nI stumbled on a mention of the \".git folder\" when going through the\ndoc-diff between v2.33.0 and 9d530dc002 (\"The fourteenth batch\",\n2021-10-18), and started looking around. This series is the outcome.\n\nBased on master.\n\nMartin Ågren (3):\n git-multi-pack-index.txt: change \"folder\" to \"directory\"\n gitignore.txt: change \"folder\" to \"directory\"\n gitweb.txt: change \"folder\" to \"directory\"\n\n Documentation/git-multi-pack-index.txt | 6 +++---\n Documentation/gitignore.txt | 2 +-\n Documentation/gitweb.txt | 2 +-\n 3 files changed, 5 insertions(+), 5 deletions(-)\n\n-- \n2.33.1.711.g9d530dc002\n\n"},{"id":"439496","messageId":"a2db03adddee0a8b46e943b40a85a8d44a20c10a.1635094161.git.martin.agren@gmail.com","threadId":"56774","inReplyTo":"cover.1635094161.git.martin.agren@gmail.com","subject":"[PATCH 1/3] git-multi-pack-index.txt: change \"folder\" to \"directory\"","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2021-10-24T17:09:15Z","receivedAt":"2021-10-24T17:09:55Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"We prefer \"directory\" over \"folder\" when discussing the file system\nconcept. In all of our documentation, these are the only spots where we\nrefer to the `.git` directory as a folder. Switch to \"directory\", and\nwhile doing so, add backticks to the \".git\" filename to set it in\nmonospace.\n\nSigned-off-by: Martin Ågren \n---\n Documentation/git-multi-pack-index.txt | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt\nindex b008ce2850..c588fb91af 100644\n--- a/Documentation/git-multi-pack-index.txt\n+++ b/Documentation/git-multi-pack-index.txt\n@@ -99,13 +99,13 @@ associated `.keep` file will not be selected for the batch to repack.\n EXAMPLES\n --------\n \n-* Write a MIDX file for the packfiles in the current .git folder.\n+* Write a MIDX file for the packfiles in the current `.git` directory.\n +\n -----------------------------------------------\n $ git multi-pack-index write\n -----------------------------------------------\n \n-* Write a MIDX file for the packfiles in the current .git folder with a\n+* Write a MIDX file for the packfiles in the current `.git` directory with a\n corresponding bitmap.\n +\n -------------------------------------------------------------\n@@ -118,7 +118,7 @@ $ git multi-pack-index write --preferred-pack= --bitmap\n $ git multi-pack-index --object-dir write\n -----------------------------------------------\n \n-* Verify the MIDX file for the packfiles in the current .git folder.\n+* Verify the MIDX file for the packfiles in the current `.git` directory.\n +\n -----------------------------------------------\n $ git multi-pack-index verify\n-- \n2.33.1.711.g9d530dc002\n\n"},{"id":"439497","messageId":"4f3ba7fbce97fe74821664c80758ee9781c491c0.1635094161.git.martin.agren@gmail.com","threadId":"56774","inReplyTo":"cover.1635094161.git.martin.agren@gmail.com","subject":"[PATCH 2/3] gitignore.txt: change \"folder\" to \"directory\"","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2021-10-24T17:09:16Z","receivedAt":"2021-10-24T17:10:01Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"We prefer \"directory\" over \"folder\" when discussing the file system\nconcept. Change this instance for consistency -- indeed, even within\nthis paragraph, we already use \"directory\".\n\nSigned-off-by: Martin Ågren \n---\n Documentation/gitignore.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt\nindex f8a1fc2014..f2738b10db 100644\n--- a/Documentation/gitignore.txt\n+++ b/Documentation/gitignore.txt\n@@ -155,7 +155,7 @@ accessed from the index or a tree versus from the filesystem.\n EXAMPLES\n --------\n \n- - The pattern `hello.*` matches any file or folder\n+ - The pattern `hello.*` matches any file or directory\n whose name begins with `hello.`. If one wants to restrict\n this only to the directory and not in its subdirectories,\n one can prepend the pattern with a slash, i.e. `/hello.*`;\n-- \n2.33.1.711.g9d530dc002\n\n"},{"id":"439498","messageId":"e95118e70788485ed1172d9a6dc7962c632a8d26.1635094161.git.martin.agren@gmail.com","threadId":"56774","inReplyTo":"cover.1635094161.git.martin.agren@gmail.com","subject":"[PATCH 3/3] gitweb.txt: change \"folder\" to \"directory\"","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2021-10-24T17:09:17Z","receivedAt":"2021-10-24T17:10:09Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"We prefer \"directory\" over \"folder\" when discussing the file system\nconcept. Change this instance for consistency.\n\nAfter this, the only hits for '\\' in Documentation/ relate to\nIMAP folders.\n\nSigned-off-by: Martin Ågren \n---\n Documentation/gitweb.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\nindex 3cc9b034c4..7cee9d3689 100644\n--- a/Documentation/gitweb.txt\n+++ b/Documentation/gitweb.txt\n@@ -547,7 +547,7 @@ like this:\n # make the front page an internal rewrite to the gitweb script\n RewriteRule ^/$ /cgi-bin/gitweb.cgi [QSA,L,PT]\n \n- # look for a public_git folder in unix users' home\n+ # look for a public_git directory in unix users' home\n # http://git.example.org/~/\n RewriteRule ^/\\~([^\\/]+)(/|/gitweb.cgi)?$\t/cgi-bin/gitweb.cgi \\\n \t\t[QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]\n-- \n2.33.1.711.g9d530dc002\n\n"},{"id":"439521","messageId":"481447f9-7222-d9fc-269f-2de50299fb09@gmail.com","threadId":"56774","inReplyTo":"cover.1635094161.git.martin.agren@gmail.com","subject":"Re: [PATCH 0/3] Documentation: change \"folder\" to \"directory\"","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-10-25T09:19:18Z","receivedAt":"2021-10-25T09:19:33Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 25/10/21 00.09, Martin Ågren wrote:\n> It is my understanding that we prefer \"directory\" over \"folder\" when\n> discussing the file system concept. (Whereas \"folder\" is commonly used\n> for the GUI view of such a directory, or for an IMAP folder.)\n> \n> I stumbled on a mention of the \".git folder\" when going through the\n> doc-diff between v2.33.0 and 9d530dc002 (\"The fourteenth batch\",\n> 2021-10-18), and started looking around. This series is the outcome.\n> \n> Based on master.\n> \n> Martin Ågren (3):\n> git-multi-pack-index.txt: change \"folder\" to \"directory\"\n> gitignore.txt: change \"folder\" to \"directory\"\n> gitweb.txt: change \"folder\" to \"directory\"\n> \n\nThe same logical change over three patches, why aren't they be squashed \ninto single commit?\n\n-- \nAn old man doll... just what I always wanted! - Clara\n"},{"id":"439548","messageId":"74e5e039-b259-644a-9566-c866d72cf638@gmail.com","threadId":"56774","inReplyTo":"cover.1635094161.git.martin.agren@gmail.com","subject":"Re: [PATCH 0/3] Documentation: change \"folder\" to \"directory\"","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2021-10-25T15:31:45Z","receivedAt":"2021-10-25T15:31:49Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 10/24/2021 1:09 PM, Martin Ågren wrote:\n> It is my understanding that we prefer \"directory\" over \"folder\" when\n> discussing the file system concept. (Whereas \"folder\" is commonly used\n> for the GUI view of such a directory, or for an IMAP folder.)\n> \n> I stumbled on a mention of the \".git folder\" when going through the\n> doc-diff between v2.33.0 and 9d530dc002 (\"The fourteenth batch\",\n> 2021-10-18), and started looking around. This series is the outcome.\n\nThanks for these changes, in particular for the ones that I had\nintroduced in git-multi-pack-index.txt.\n\nThanks,\n-Stolee\n"},{"id":"439573","messageId":"xmqqo87d0yfg.fsf@gitster.g","threadId":"56774","inReplyTo":"cover.1635094161.git.martin.agren@gmail.com","subject":"Re: [PATCH 0/3] Documentation: change \"folder\" to \"directory\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-10-25T18:08:51Z","receivedAt":"2021-10-25T18:08:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> It is my understanding that we prefer \"directory\" over \"folder\" when\n> discussing the file system concept. (Whereas \"folder\" is commonly used\n> for the GUI view of such a directory, or for an IMAP folder.)\n>\n> I stumbled on a mention of the \".git folder\" when going through the\n> doc-diff between v2.33.0 and 9d530dc002 (\"The fourteenth batch\",\n> 2021-10-18), and started looking around. This series is the outcome.\n>\n> Based on master.\n>\n> Martin Ågren (3):\n> git-multi-pack-index.txt: change \"folder\" to \"directory\"\n> gitignore.txt: change \"folder\" to \"directory\"\n> gitweb.txt: change \"folder\" to \"directory\"\n\nThanks. Being consistent is good.\n\nWe should have been a bit more careful when we reviewed the changes\nthat introduced these.\n"},{"id":"439629","messageId":"CAN0heSrco2P9cwhDNkXeO1xNMAr4+Mo1+0Y-UEhF5vgrkBOa3A@mail.gmail.com","threadId":"56774","inReplyTo":"481447f9-7222-d9fc-269f-2de50299fb09@gmail.com","subject":"Re: [PATCH 0/3] Documentation: change \"folder\" to \"directory\"","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2021-10-26T06:02:44Z","receivedAt":"2021-10-26T06:03:11Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Hi Bagas,\n\nOn Mon, 25 Oct 2021 at 11:19, Bagas Sanjaya wrote:\n>\n> On 25/10/21 00.09, Martin Ågren wrote:\n> > Martin Ågren (3):\n> > git-multi-pack-index.txt: change \"folder\" to \"directory\"\n> > gitignore.txt: change \"folder\" to \"directory\"\n> > gitweb.txt: change \"folder\" to \"directory\"\n> >\n>\n> The same logical change over three patches, why aren't they be squashed\n> into single commit?\n\nOld habit, I guess. :) I tend to find that having multiple patches aids\nreviewing. Within reason, obviously. Reviewers don't have to go \"I agree\nwith everything except that particular hunk\", but can just say \"I agree\nwith everything except patch two\", making tracking things a bit easier.\n\nSimilarly, if the patches are all independent (albeit being about the\nsame topic) and it comes up that a particular patch is not such a good\nidea after all because reasons, Junio could just decide to apply a\nsubset and leave the rest. In this case, the commit message of the third\npatch assumes that the first two have already been applied, so they're\nnot completely independent, but that's about the only interdependency\nthere is in these.\n\nI'm happy to go either way.\n\nMartin\n"},{"id":"439808","messageId":"xmqqh7d2wbh7.fsf@gitster.g","threadId":"56774","inReplyTo":"CAN0heSrco2P9cwhDNkXeO1xNMAr4+Mo1+0Y-UEhF5vgrkBOa3A@mail.gmail.com","subject":"Re: [PATCH 0/3] Documentation: change \"folder\" to \"directory\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-10-27T18:48:04Z","receivedAt":"2021-10-27T18:48:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> Old habit, I guess. :) I tend to find that having multiple patches aids\n> reviewing. Within reason, obviously. Reviewers don't have to go \"I agree\n> with everything except that particular hunk\", but can just say \"I agree\n> with everything except patch two\", making tracking things a bit easier.\n\nIn this case, changes to three separate files are presented in three\nseparate patches, which was a quite pleasant read. I do appreciate\nthat you said \"within reason\" ;-)\n"}]}