{"thread":{"id":"46411","subject":"Documentation lingering inconsistency between working directory and working tree","startedAt":"2017-07-17T19:34:48Z","lastAt":"2017-07-17T19:34:48Z","messageCount":1,"participants":["Yazeed Sabri"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"324665","messageId":"CAL+VFimBfxTrRVme_aMzF4yYRnru0hHD4VzxEtD8hHY6rx2ykA@mail.gmail.com","threadId":"46411","inReplyTo":null,"subject":"Documentation lingering inconsistency between working directory and working tree","fromName":"Yazeed Sabri","fromEmail":"yazeed.sabri@kaust.edu.sa","sentAt":"2017-07-17T19:34:41Z","receivedAt":"2017-07-17T19:34:48Z","isPatch":false,"sender":{"key":"yazeed.sabri@kaust.edu.sa","avatar":null},"body":"Hi all,\n\nI have been reading the git documentation for a while now and came to\nrealize that in a\nlot of commands the documentation is ambiguous when it comes to the difference\nbetween \"working directory\" and \"working tree\". I'm aware of the\nchanges to status\nin this commit for example:\n\n\ncommit 2a0e6cdedab306eccbd297c051035c13d0266343\nAuthor: Lars Vogel <lars.vogel@gmail.com>\nDate:   Thu Jun 9 20:19:30 2016 +0200\n\n    Use \"working tree\" instead of \"working directory\" for git status\n\n    Working directory can be easily confused with the current directory.\n    In one of my patches I already updated the usage of working\ndirectory\n    with working tree for the man page but I noticed that git status\nalso\n    uses this incorrect term.\n\n    Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>\n    Signed-off-by: Junio C Hamano <gitster@pobox.com>\n\ndiff --git a/wt-status.c b/wt-status.c\nindex 4f27bd62a..4ce4e35ac 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -1554,7 +1554,7 @@ void wt_status_print(struct wt_status *s)\n                        else\n                                printf(_(\"nothing to commit\\n\"));\n                } else\n-                       printf(_(\"nothing to commit, working directory\nclean\\n\"));\n+                       printf(_(\"nothing to commit, working tree\nclean\\n\"));\n        }\n }\n\n\n\nand more frequently used commands like add are consistent as well. But a\ngrep on the documentation to a pull I did today, shows that a lot of\ncommands are still\nnot updated accordingly.\n\nThis brings me to my next point, so what is the precise definition of\neach concept? Is\nworking directory just an outdated mistake?\n\nWas the change in status above made to solve the confusion and denote\nthat status\nis unique per-working tree given its HEAD? If this is the case, then\nis gc unique\nper-working tree too, or is it done on the \"database\" like fsck? Same\nidea with stash,\ndoes stash care on what working tree it was called? If not, does it\nmake sense for\nit to do so?\n\n\nBest,\nYazeed\n\n-- \n\n------------------------------\nThis message and its contents, including attachments are intended solely \nfor the original recipient. If you are not the intended recipient or have \nreceived this message in error, please notify me immediately and delete \nthis message from your computer system. Any unauthorized use or \ndistribution is prohibited. Please consider the environment before printing \nthis email.\n"}]}