{"thread":{"id":"40008","subject":"[PATCH 1/2] Documentation/git-worktree: fix duplicated 'from'","startedAt":"2015-08-04T12:27:57Z","lastAt":"2015-08-04T18:27:26Z","messageCount":4,"participants":["Patrick Steinhardt","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"267394","messageId":"1438691278-31609-1-git-send-email-ps@pks.im","threadId":"40008","inReplyTo":null,"subject":"[PATCH 1/2] Documentation/git-worktree: fix duplicated 'from'","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2015-08-04T12:27:57Z","receivedAt":"2015-08-04T12:27:57Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"Signed-off-by: Patrick Steinhardt \n---\n Documentation/git-worktree.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex 3387e2f..566ca92 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -124,7 +124,7 @@ thumb is do not make any assumption about whether a path belongs to\n $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something\n inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.\n \n-To prevent a $GIT_DIR/worktrees entry from from being pruned (which\n+To prevent a $GIT_DIR/worktrees entry from being pruned (which\n can be useful in some situations, such as when the\n entry's working tree is stored on a portable device), add a file named\n 'locked' to the entry's directory. The file contains the reason in\n-- \n2.5.0\n"},{"id":"267395","messageId":"1438691278-31609-2-git-send-email-ps@pks.im","threadId":"40008","inReplyTo":"1438691278-31609-1-git-send-email-ps@pks.im","subject":"[PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2015-08-04T12:27:58Z","receivedAt":"2015-08-04T12:27:58Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"The documentation of git-worktree refers to the 'locked' file as\n'lock'. Fix this to say 'locked' instead.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/git-worktree.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex 566ca92..3fedd9e 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -39,7 +39,7 @@ repository so that they do not get automatically pruned.\n \n If a linked working tree is stored on a portable device or network share\n which is not always mounted, you can prevent its administrative files from\n-being pruned by creating a file named 'lock' alongside the other\n+being pruned by creating a file named 'locked' alongside the other\n administrative files, optionally containing a plain text reason that\n pruning should be suppressed. See section \"DETAILS\" for more information.\n \n-- \n2.5.0\n"},{"id":"267474","messageId":"CAPig+cS5Mk-11S+9mSkeaw0nCmb_AS4DC5apwkeXBAROVwE0TA@mail.gmail.com","threadId":"40008","inReplyTo":"1438691278-31609-2-git-send-email-ps@pks.im","subject":"Re: [PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-08-04T18:18:02Z","receivedAt":"2015-08-04T18:18:02Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Tue, Aug 4, 2015 at 8:27 AM, Patrick Steinhardt wrote:\n> The documentation of git-worktree refers to the 'locked' file as\n> 'lock'. Fix this to say 'locked' instead.\n\nThanks for the patch. This is already fixed in 'next' by 2e73ab6\n(Documentation/git-worktree: fix incorrect reference to file \"locked\",\n2015-07-20)\n\n> Signed-off-by: Patrick Steinhardt \n> ---\n> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\n> index 566ca92..3fedd9e 100644\n> --- a/Documentation/git-worktree.txt\n> +++ b/Documentation/git-worktree.txt\n> @@ -39,7 +39,7 @@ repository so that they do not get automatically pruned.\n>\n> If a linked working tree is stored on a portable device or network share\n> which is not always mounted, you can prevent its administrative files from\n> -being pruned by creating a file named 'lock' alongside the other\n> +being pruned by creating a file named 'locked' alongside the other\n> administrative files, optionally containing a plain text reason that\n> pruning should be suppressed. See section \"DETAILS\" for more information.\n"},{"id":"267475","messageId":"CAPig+cSghsmoEcmJnmO48GyF_VDpKPuOCafm4n+YFCwRE7+D-Q@mail.gmail.com","threadId":"40008","inReplyTo":"1438691278-31609-1-git-send-email-ps@pks.im","subject":"Re: [PATCH 1/2] Documentation/git-worktree: fix duplicated 'from'","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-08-04T18:27:26Z","receivedAt":"2015-08-04T18:27:26Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Tue, Aug 4, 2015 at 8:27 AM, Patrick Steinhardt wrote:\n> Signed-off-by: Patrick Steinhardt \n> ---\n> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\n> index 3387e2f..566ca92 100644\n> --- a/Documentation/git-worktree.txt\n> +++ b/Documentation/git-worktree.txt\n> @@ -124,7 +124,7 @@ thumb is do not make any assumption about whether a path belongs to\n> $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something\n> inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.\n>\n> -To prevent a $GIT_DIR/worktrees entry from from being pruned (which\n> +To prevent a $GIT_DIR/worktrees entry from being pruned (which\n\nThanks. I vaguely recall spotting this repetition when preparing to\nmove this chunk of text from git-checkout.txt to git-worktree.txt[1],\nand planned on fixing it in a follow-on patch (such as [2,3,4,5]), but\nforgot about it. For what it's worth (though certainly not necessary\nfor such an obviously correct path):\n\nAcked-by: Eric Sunshine \n\n[1]: 93a3649 (Documentation: move linked worktree description from\ncheckout to worktree, 2015-07-06)\n[2]: 6d3824c (Documentation/git-worktree: add BUGS section, 2015-07-06)\n[3]: af189b4 (Documentation/git-worktree: split technical info from\ngeneral description, 2015-07-06)\n[4]: a8ba5dd (Documentation/git-worktree: add high-level 'lock'\noverview, 2015-07-06)\n[5]: 9645459 (Documentation/git-worktree: add EXAMPLES section, 2015-07-06)\n\n> can be useful in some situations, such as when the\n> entry's working tree is stored on a portable device), add a file named\n> 'locked' to the entry's directory. The file contains the reason in\n> --\n> 2.5.0\n"}]}