git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/6] worktree: fix incorrect references to file "locked"

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 19, 2015, 03:04 UTC
Message-ID
<CAPig+cS4CC8D9JKxw3KSKMZdb_3sWR0C91LL9qcKrF-+RAbfEQ@mail.gmail.com>
In-Reply-To
<dfaad2ac35a59b93f1f650d3398c861abd84f289.1437271363.git.mhagger@alum.mit.edu>
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
Show 15 quoted lines
> The manpage referred to file "lock" in a couple of places. The file is
> actually called "locked".
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
> 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.
Show 10 quoted lines
>  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.

Previous: Michael HaggertyNext: Michael Haggerty
Message 7 of 14 in “Various tweaks to 'worktree'-related manpages”
  1. 0/6 Various tweaks to 'worktree'-related manpagesMichael Haggerty, Jul 19, 2015
  2. 1/6 worktree: consistently use term "linked working tree" in manpagesMichael Haggerty, Jul 19, 2015
  3. Eric SunshineJul 19, 2015
  4. 2/6 worktree: remove references to "git checkout --to" from the manpageMichael Haggerty, Jul 19, 2015
  5. Eric SunshineJul 19, 2015
  6. 3/6 worktree: fix incorrect references to file "locked"Michael Haggerty, Jul 19, 2015
  7. Eric SunshineJul 19, 2015
  8. 4/6 worktree: the "locked" mechanism is already implementedMichael Haggerty, Jul 19, 2015
  9. Eric SunshineJul 19, 2015
  10. 5/6 config.txt: refer to "git worktree prune", not "prune --worktree"Michael Haggerty, Jul 19, 2015
  11. Eric SunshineJul 19, 2015
  12. 6/6 worktree: wordsmith worktree-related manpagesMichael Haggerty, Jul 19, 2015
  13. Eric SunshineJul 19, 2015
  14. Eric SunshineJul 19, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.