{"thread":{"id":"40115","subject":"[PATCH] Documentation: read-tree consistent usage of working tree","startedAt":"2015-08-17T20:06:19Z","lastAt":"2015-08-25T16:31:12Z","messageCount":2,"participants":["Lars Vogel","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"268221","messageId":"1439841979-27110-1-git-send-email-Lars.Vogel@vogella.com","threadId":"40115","inReplyTo":null,"subject":"[PATCH] Documentation: read-tree consistent usage of working tree","fromName":"Lars Vogel","fromEmail":"lars.vogel@vogella.com","sentAt":"2015-08-17T20:06:19Z","receivedAt":"2015-08-17T20:06:19Z","isPatch":true,"sender":{"key":"lars.vogel@vogella.com","avatar":"https://gravatar.com/avatar/5e501b3827120cf228798a08717c5eed466d50fa22b12a8ce82ea15ce11cc38d?d=mp&s=160"},"body":"http://git-scm.com/docs/git-clone speaks only about working tree, the\nusage of \"working directory\" for working tree is confusing. Working\ndirectory describes the current directory while working tree describes\nall files and sub directories.\n\nSigned-off-by: Lars Vogel <Lars.Vogel@vogella.com>\n---\n Documentation/git-read-tree.txt | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex fa1d557..21daee9 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -378,15 +378,15 @@ have finished your work-in-progress), attempt the merge again.\n Sparse checkout\n ---------------\n \n-\"Sparse checkout\" allows populating the working directory sparsely.\n+\"Sparse checkout\" allows populating the working tree sparsely.\n It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell\n-Git whether a file in the working directory is worth looking at.\n+Git whether a file in the working tree is worth looking at.\n \n 'git read-tree' and other merge-based commands ('git merge', 'git\n checkout'...) can help maintaining the skip-worktree bitmap and working\n directory update. `$GIT_DIR/info/sparse-checkout` is used to\n define the skip-worktree reference bitmap. When 'git read-tree' needs\n-to update the working directory, it resets the skip-worktree bit in the index\n+to update the working tree, it resets the skip-worktree bit in the index\n based on this file, which uses the same syntax as .gitignore files.\n If an entry matches a pattern in this file, skip-worktree will not be\n set on that entry. Otherwise, skip-worktree will be set.\n@@ -404,7 +404,7 @@ negate patterns. For example, to remove the file `unwanted`:\n !unwanted\n ----------------\n \n-Another tricky thing is fully repopulating the working directory when you\n+Another tricky thing is fully repopulating the working tree when you\n no longer want sparse checkout. You cannot just disable \"sparse\n checkout\" because skip-worktree bits are still in the index and your working\n directory is still sparsely populated. You should re-populate the working\n-- \n2.5.0\n"},{"id":"268654","messageId":"xmqqpp2b1ga7.fsf@gitster.dls.corp.google.com","threadId":"40115","inReplyTo":"1439841979-27110-1-git-send-email-Lars.Vogel@vogella.com","subject":"Re: [PATCH] Documentation: read-tree consistent usage of working tree","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-08-25T16:31:12Z","receivedAt":"2015-08-25T16:31:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lars Vogel <lars.vogel@vogella.com> writes:\n\n> http://git-scm.com/docs/git-clone speaks only about working tree, the\n> usage of \"working directory\" for working tree is confusing. Working\n> directory describes the current directory while working tree describes\n> all files and sub directories.\n\nActually I think the $cwd is the \"Current working directory\"; the\nphrase \"Working directory\" alone does not specifically refer to $cwd.\n\nBeing consistent to call the checked out file hierarchy \"working tree\"\nis probably a good idea nevertheless.\n\n> Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>\n> ---\n\nIf you apply this patch and then run\n\n    $ git grep -B1 '^directory' Documentation/git-read-tree.txt\n\nyou would notice that the patch has missed a few more.\n\nAlso\n\n    $ git grep 'work tree' Documentation/git-read-tree.txt\n\nhas a handful of hits.\n\nPerhaps try again?\n\nThanks.\n"}]}