Re: [PATCH 3/6] worktree: fix incorrect references to file "locked"
From: Eric Sunshine <hidden>
Date: 2016-06-15 23:05:48
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty [off-list ref] wrote:
quoted hunk ↗ jump to hunk
The manpage referred to file "lock" in a couple of places. The file is actually called "locked". Signed-off-by: Michael Haggerty <redacted> ---diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 707dfd0..6cb3877 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt@@ -39,7 +39,7 @@ repository so that they do not get automatically pruned. If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from -being pruned by creating a file named 'lock' alongside the other +being pruned by creating a file named 'locked' alongside the other
This change is good.
quoted hunk ↗ jump to hunk
administrative files, optionally containing a plain text reason that pruning should be suppressed. See section "DETAILS" for more information.@@ -167,7 +167,7 @@ performed manually, such as: warn if the worktree is dirty) - `mv` to move or rename a worktree and update its administrative files - `list` to list linked working trees -- `lock` to prevent automatic pruning of administrative files (for instance, +- `locked` to prevent automatic pruning of administrative files (for instance, for a worktree on a portable device)
This one is not. This 'lock' is referring to a proposed user-interface
command ("git worktree lock") for manipulating the underlying 'locked'
file so that the user doesn't have to have detailed implementation
knowledge or muck with the underlying mechanics manually.