{"thread":{"id":"39864","subject":"[PATCH v2] Documentation/git-worktree: fix stale \"git checkout --to\" references","startedAt":"2015-07-16T22:09:43Z","lastAt":"2015-07-16T23:26:32Z","messageCount":3,"participants":["Eric Sunshine","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"266213","messageId":"1437084583-6382-1-git-send-email-sunshine@sunshineco.com","threadId":"39864","inReplyTo":null,"subject":"[PATCH v2] Documentation/git-worktree: fix stale \"git checkout --to\" references","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-16T22:09:43Z","receivedAt":"2015-07-16T22:09:43Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"These should have been changed to \"git worktree add\" by fc56361\n(worktree: introduce \"add\" command, 2015-07-06.\n\nSigned-off-by: Eric Sunshine \n---\n\nChanges since v1[1]: Reference the correct commit (fc56361, not b979d95)\nin the commit message. Sorry for the noise.\n\n[1]: http://article.gmane.org/gmane.comp.version-control.git/274046\n\n Documentation/git-worktree.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex da71f50..44619f2 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -18,7 +18,7 @@ DESCRIPTION\n Manage multiple worktrees attached to the same repository.\n \n A git repository can support multiple working trees, allowing you to check\n-out more than one branch at a time. With `git checkout --to` a new working\n+out more than one branch at a time. With `git worktree add` a new working\n tree is associated with the repository. This new working tree is called a\n \"linked working tree\" as opposed to the \"main working tree\" prepared by \"git\n init\" or \"git clone\". A repository has one main working tree (if it's not a\n@@ -99,7 +99,7 @@ Each linked working tree has a private sub-directory in the repository's\n $GIT_DIR/worktrees directory. The private sub-directory's name is usually\n the base name of the linked working tree's path, possibly appended with a\n number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the\n-command `git checkout --to /path/other/test-next next` creates the linked\n+command `git worktree add /path/other/test-next next` creates the linked\n working tree in `/path/other/test-next` and also creates a\n `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`\n if `test-next` is already taken).\n-- \n2.5.0.rc2.378.g0af52e8\n"},{"id":"266214","messageId":"xmqq4ml34snd.fsf@gitster.dls.corp.google.com","threadId":"39864","inReplyTo":"1437084583-6382-1-git-send-email-sunshine@sunshineco.com","subject":"Re: [PATCH v2] Documentation/git-worktree: fix stale \"git checkout --to\" references","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-16T22:57:58Z","receivedAt":"2015-07-16T22:57:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine writes:\n\n> These should have been changed to \"git worktree add\" by fc56361\n> (worktree: introduce \"add\" command, 2015-07-06.\n>\n> Signed-off-by: Eric Sunshine \n> ---\n>\n> Changes since v1[1]: Reference the correct commit (fc56361, not b979d95)\n> in the commit message. Sorry for the noise.\n>\n> [1]: http://article.gmane.org/gmane.comp.version-control.git/274046\n\nThanks. Will apply.\n\nBy the way, given the rate of bugs and glitches I am finding in this\ncode with a very superficial use in real work only for a few days,\nperhaps we would want to add a warning to the documentation of \"git\nworktree\", in addition to the \"this is still experimental\" mention\nin the release notes, to discourage people to keep their only copy\nof the work in a secondary worktree for now?\n\n\n\n Documentation/git-worktree.txt | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex da71f50..6de4c21 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -157,8 +157,9 @@ $ git worktree prune\n \n BUGS\n ----\n-Multiple checkout support for submodules is incomplete. It is NOT\n-recommended to make multiple checkouts of a superproject.\n+Multiple checkout in general is still experimental, and the support\n+for submodules is incomplete. It is NOT recommended to make multiple\n+checkouts of a superproject.\n \n git-worktree could provide more automation for tasks currently\n performed manually, such as:\n"},{"id":"266216","messageId":"CAPig+cTPfOs-VkkDJ3LNrQ3ZC14PixOcx_Y4k=pMjMOYVHzO=g@mail.gmail.com","threadId":"39864","inReplyTo":"xmqq4ml34snd.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v2] Documentation/git-worktree: fix stale \"git checkout --to\" references","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-16T23:26:32Z","receivedAt":"2015-07-16T23:26:32Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Thu, Jul 16, 2015 at 6:57 PM, Junio C Hamano wrote:\n> Eric Sunshine writes:\n>> These should have been changed to \"git worktree add\" by fc56361\n>> (worktree: introduce \"add\" command, 2015-07-06.\n>>\n>> Signed-off-by: Eric Sunshine \n>> ---\n> By the way, given the rate of bugs and glitches I am finding in this\n> code with a very superficial use in real work only for a few days,\n> perhaps we would want to add a warning to the documentation of \"git\n> worktree\", in addition to the \"this is still experimental\" mention\n> in the release notes, to discourage people to keep their only copy\n> of the work in a secondary worktree for now?\n>\n> BUGS\n> ----\n> -Multiple checkout support for submodules is incomplete. It is NOT\n> -recommended to make multiple checkouts of a superproject.\n> +Multiple checkout in general is still experimental, and the support\n> +for submodules is incomplete. It is NOT recommended to make multiple\n> +checkouts of a superproject.\n\nMaybe, maybe not.\n\nThe submodule item is at least (hopefully) quantitative. That is,\nthere should be some point after specific shortcomings have been\naddressed when we can say \"submodules are now supported\", and remove\nthe item from BUGS.\n\nBut, \"in general is still experimental\" is nebulous and open-ended. At\nwhat point do we stop considering it experimental, and who will\nremember to remove the entry from BUGS when that day comes?\n\nOther than that concern, the revised text seems reasonable.\n"}]}