{"thread":{"id":"39898","subject":"[PATCH v2 1/5] Documentation/git-worktree: consistently use term \"linked working tree\"","startedAt":"2015-07-20T05:29:17Z","lastAt":"2015-07-24T00:51:51Z","messageCount":9,"participants":["Eric Sunshine","Michael Haggerty","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":5},"messages":[{"id":"266474","messageId":"1437370162-8031-1-git-send-email-sunshine@sunshineco.com","threadId":"39898","inReplyTo":null,"subject":"[PATCH v2 0/5] mh: worktree-related doc fixes","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-20T05:29:17Z","receivedAt":"2015-07-20T05:29:17Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"This re-roll of Michael Haggerty's worktree-related documentation\ntweaks[1] takes my review comments into account and adds one new patch.\nA v1 to v2 interdiff is included below.\n\nChanges since v1:\n\npatch 1/5: fix additional instances of \"worktree\" -> \"working tree\"\n\npatch 2/5: don't rename \"git worktree lock\" command to \"git worktree\n    locked\" when renaming incorrect worktrees/<id>/lock to\n    worktrees/<id>/locked\n\npatch 4/5: further refine .git/worktrees and .git/worktrees/<id>/locked\n    descriptions\n\npatch 5/5 (new/optional): based upon a review comment tangent, rename\n    config variable gc.pruneWorktreesExpire to gc.worktreePruneExpire;\n    can be dropped if not deemed worthwhile\n\nA couple of Michael's v1 patches were also dropped:\n\npatch 2/6: these changes are already in master: 4d5a3c5\n    (Documentation/git-worktree: fix stale \"git checkout --to\"\n    references, 2015-07-16)\n\npatch 4/6: incorrectly dropped unimplemented user-interface command\n    \"git worktree lock\" from BUGS section, conflating it with low-level\n    locking functionality which is already implemented\n\nA few commit messages were also reworded.\n\n[1]: http://thread.gmane.org/gmane.comp.version-control.git/274190\n\nEric Sunshine (1):\n  config: rename \"gc.pruneWorktreesExpire\" to \"gc.worktreePruneExpire\"\n\nMichael Haggerty (4):\n  Documentation/git-worktree: consistently use term \"linked working\n    tree\"\n  Documentation/git-worktree: fix incorrect reference to file \"locked\"\n  Documentation/config: fix stale \"git prune --worktree\" reference\n  Documentation/git-worktree: wordsmith worktree-related manpages\n\n Documentation/config.txt               | 12 +++++-----\n Documentation/git-worktree.txt         | 40 +++++++++++++++++-----------------\n Documentation/gitrepository-layout.txt | 22 +++++++++----------\n builtin/gc.c                           |  2 +-\n 4 files changed, 38 insertions(+), 38 deletions(-)\n\n-- \n2.5.0.rc2.386.g87d813d\n\n---- 8< ----\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 10bc351..746d292 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1291,7 +1291,7 @@ gc.pruneExpire::\n \t\"now\" may be used to disable this  grace period and always prune\n \tunreachable objects immediately.\n \n-gc.pruneWorktreesExpire::\n+gc.worktreePruneExpire::\n \tWhen 'git gc' is run, it calls\n \t'git worktree prune --expire 3.months.ago'.\n \tThis config variable can be used to set a different grace\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex dfac758..3234459 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -3,7 +3,7 @@ git-worktree(1)\n \n NAME\n ----\n-git-worktree - Manage multiple worktrees\n+git-worktree - Manage multiple working trees\n \n \n SYNOPSIS\n@@ -15,7 +15,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-Manage multiple worktrees attached to the same repository.\n+Manage multiple working trees 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 worktree add` a new working\n@@ -27,7 +27,7 @@ bare repository) and zero or more linked working trees.\n When you are done with a linked working tree you can simply delete it.\n The working tree's administrative files in the repository (see\n \"DETAILS\" below) will eventually be removed automatically (see\n-`gc.pruneworktreesexpire` in linkgit::git-config[1]), or you can run\n+`gc.worktreePruneExpire` in linkgit::git-config[1]), or you can run\n `git worktree prune` in the main or any linked working tree to\n clean up any stale administrative files.\n \n@@ -64,22 +64,22 @@ OPTIONS\n \n -f::\n --force::\n-\tBy default, `add` refuses to create a new worktree when\t`<branch>`\n-\tis already checked out by another worktree. This option overrides\n+\tBy default, `add` refuses to create a new working tree when `<branch>`\n+\tis already checked out by another working tree. This option overrides\n \tthat safeguard.\n \n -b <new-branch>::\n -B <new-branch>::\n \tWith `add`, create a new branch named `<new-branch>` starting at\n-\t`<branch>`, and check out `<new-branch>` into the new worktree.\n+\t`<branch>`, and check out `<new-branch>` into the new working tree.\n \tIf `<branch>` is omitted, it defaults to HEAD.\n \tBy default, `-b` refuses to create a new branch if it already\n \texists. `-B` overrides this safeguard, resetting `<new-branch>` to\n \t`<branch>`.\n \n --detach::\n-\tWith `add`, detach HEAD in the new worktree. See \"DETACHED HEAD\" in\n-\tlinkgit:git-checkout[1].\n+\tWith `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\"\n+\tin linkgit:git-checkout[1].\n \n -n::\n --dry-run::\n@@ -91,7 +91,7 @@ OPTIONS\n \tWith `prune`, report all removals.\n \n --expire <time>::\n-\tWith `prune`, only expire unused worktrees older than <time>.\n+\tWith `prune`, only expire unused working trees older than <time>.\n \n DETAILS\n -------\n@@ -138,9 +138,9 @@ EXAMPLES\n --------\n You are in the middle of a refactoring session and your boss comes in and\n demands that you fix something immediately. You might typically use\n-linkgit:git-stash[1] to store your changes away temporarily; however, your\n-worktree is in such a state of disarray (with new, moved, and removed files,\n-and other bits and pieces strewn around) that you don't want to risk\n+linkgit:git-stash[1] to store your changes away temporarily, however, your\n+working tree is in such a state of disarray (with new, moved, and removed\n+files, and other bits and pieces strewn around) that you don't want to risk\n disturbing any of it. Instead, you create a temporary linked working tree to\n make the emergency fix, remove it when done, and then resume your earlier\n refactoring session.\n@@ -165,9 +165,11 @@ git-worktree could provide more automation for tasks currently\n performed manually, such as:\n \n - `remove` to remove a linked working tree and its administrative files (and\n-  warn if the worktree is dirty)\n-- `mv` to move or rename a worktree and update its administrative files\n+  warn if the working tree is dirty)\n+- `mv` to move or rename a working tree and update its administrative files\n - `list` to list linked working trees\n+- `lock` to prevent automatic pruning of administrative files (for instance,\n+  for a working tree on a portable device)\n \n GIT\n ---\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex fe7d4bb..577ee84 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -251,8 +251,8 @@ modules::\n \tContains the git-repositories of the submodules.\n \n worktrees::\n-\tContains worktree-specific information for linked working\n-\ttrees. Each subdirectory contains the worktree-related\n+\tContains administrative data for linked\n+\tworking trees. Each subdirectory contains the working tree-related\n \tpart of a linked working tree. This directory is ignored if\n \t$GIT_COMMON_DIR is set, in which case\n \t\"$GIT_COMMON_DIR/worktrees\" will be used instead.\n@@ -267,9 +267,9 @@ worktrees/<id>/gitdir::\n worktrees/<id>/locked::\n \tIf this file exists, the linked working tree may be on a\n \tportable device and not available. The presence of this file\n-\tprevents `worktrees/<id>` from being pruned by `git worktree\n-\tprune`. The file may contain a string explaining why the\n-\trepository is locked.\n+\tprevents `worktrees/<id>` from being pruned either automatically\n+\tor manually by `git worktree prune`. The file may contain a string\n+\texplaining why the repository is locked.\n \n worktrees/<id>/link::\n \tIf this file exists, it is a hard link to the linked .git\ndiff --git a/builtin/gc.c b/builtin/gc.c\nindex 4957c39..bcc75d9 100644\n--- a/builtin/gc.c\n+++ b/builtin/gc.c\n@@ -85,7 +85,7 @@ static void gc_config(void)\n \tgit_config_get_int(\"gc.autopacklimit\", &gc_auto_pack_limit);\n \tgit_config_get_bool(\"gc.autodetach\", &detach_auto);\n \tgit_config_date_string(\"gc.pruneexpire\", &prune_expire);\n-\tgit_config_date_string(\"gc.pruneworktreesexpire\", &prune_worktrees_expire);\n+\tgit_config_date_string(\"gc.worktreepruneexpire\", &prune_worktrees_expire);\n \tgit_config(git_default_config, NULL);\n }\n \n---- 8< ----\n"},{"id":"266471","messageId":"1437370162-8031-2-git-send-email-sunshine@sunshineco.com","threadId":"39898","inReplyTo":"1437370162-8031-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH v2 1/5] Documentation/git-worktree: consistently use term \"linked working tree\"","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-20T05:29:18Z","receivedAt":"2015-07-20T05:29:18Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"From: Michael Haggerty <mhagger@alum.mit.edu>\n\nSometimes linked working trees were called \"linked working\ndirectories\" or \"linked worktrees\". Always refer to them as \"linked\nworking trees\" for consistency.\n\n[es: fix additional occurrences]\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n Documentation/git-worktree.txt         | 36 +++++++++++++++++-----------------\n Documentation/gitrepository-layout.txt | 10 +++++-----\n 2 files changed, 23 insertions(+), 23 deletions(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex 3387e2f..60e5cf9 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -3,7 +3,7 @@ git-worktree(1)\n \n NAME\n ----\n-git-worktree - Manage multiple worktrees\n+git-worktree - Manage multiple working trees\n \n \n SYNOPSIS\n@@ -15,7 +15,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-Manage multiple worktrees attached to the same repository.\n+Manage multiple working trees 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 worktree add` a new working\n@@ -31,9 +31,9 @@ The working tree's administrative files in the repository (see\n `git worktree prune` in the main or any linked working tree to\n clean up any stale administrative files.\n \n-If you move a linked working directory to another file system, or\n+If you move a linked working tree to another file system, or\n within a file system that does not support hard links, you need to run\n-at least one git command inside the linked working directory\n+at least one git command inside the linked working tree\n (e.g. `git status`) in order to update its administrative files in the\n repository so that they do not get automatically pruned.\n \n@@ -64,22 +64,22 @@ OPTIONS\n \n -f::\n --force::\n-\tBy default, `add` refuses to create a new worktree when\t`<branch>`\n-\tis already checked out by another worktree. This option overrides\n+\tBy default, `add` refuses to create a new working tree when `<branch>`\n+\tis already checked out by another working tree. This option overrides\n \tthat safeguard.\n \n -b <new-branch>::\n -B <new-branch>::\n \tWith `add`, create a new branch named `<new-branch>` starting at\n-\t`<branch>`, and check out `<new-branch>` into the new worktree.\n+\t`<branch>`, and check out `<new-branch>` into the new working tree.\n \tIf `<branch>` is omitted, it defaults to HEAD.\n \tBy default, `-b` refuses to create a new branch if it already\n \texists. `-B` overrides this safeguard, resetting `<new-branch>` to\n \t`<branch>`.\n \n --detach::\n-\tWith `add`, detach HEAD in the new worktree. See \"DETACHED HEAD\" in\n-\tlinkgit:git-checkout[1].\n+\tWith `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\"\n+\tin linkgit:git-checkout[1].\n \n -n::\n --dry-run::\n@@ -91,7 +91,7 @@ OPTIONS\n \tWith `prune`, report all removals.\n \n --expire <time>::\n-\tWith `prune`, only expire unused worktrees older than <time>.\n+\tWith `prune`, only expire unused working trees older than <time>.\n \n DETAILS\n -------\n@@ -139,9 +139,9 @@ EXAMPLES\n You are in the middle of a refactoring session and your boss comes in and\n demands that you fix something immediately. You might typically use\n linkgit:git-stash[1] to store your changes away temporarily, however, your\n-worktree is in such a state of disarray (with new, moved, and removed files,\n-and other bits and pieces strewn around) that you don't want to risk\n-disturbing any of it. Instead, you create a temporary linked worktree to\n+working tree is in such a state of disarray (with new, moved, and removed\n+files, and other bits and pieces strewn around) that you don't want to risk\n+disturbing any of it. Instead, you create a temporary linked working tree to\n make the emergency fix, remove it when done, and then resume your earlier\n refactoring session.\n \n@@ -164,12 +164,12 @@ checkouts of a superproject.\n git-worktree could provide more automation for tasks currently\n performed manually, such as:\n \n-- `remove` to remove a linked worktree and its administrative files (and\n-  warn if the worktree is dirty)\n-- `mv` to move or rename a worktree and update its administrative files\n-- `list` to list linked worktrees\n+- `remove` to remove a linked working tree and its administrative files (and\n+  warn if the working tree is dirty)\n+- `mv` to move or rename a working tree and update its administrative files\n+- `list` to list linked working trees\n - `lock` to prevent automatic pruning of administrative files (for instance,\n-  for a worktree on a portable device)\n+  for a working tree on a portable device)\n \n GIT\n ---\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex 7173b38..b53979c 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -251,9 +251,9 @@ modules::\n \tContains the git-repositories of the submodules.\n \n worktrees::\n-\tContains worktree specific information of linked\n-\tcheckouts. Each subdirectory contains the worktree-related\n-\tpart of a linked checkout. This directory is ignored if\n+\tContains working tree specific information of linked\n+\tworking trees. Each subdirectory contains the working tree-related\n+\tpart of a linked working tree. This directory is ignored if\n \t$GIT_COMMON_DIR is set and \"$GIT_COMMON_DIR/worktrees\" will be\n \tused instead.\n \n@@ -265,9 +265,9 @@ worktrees/<id>/gitdir::\n \tupdated every time the linked repository is accessed.\n \n worktrees/<id>/locked::\n-\tIf this file exists, the linked repository may be on a\n+\tIf this file exists, the linked working tree may be on a\n \tportable device and not available. It does not mean that the\n-\tlinked repository is gone and `worktrees/<id>` could be\n+\tlinked working tree is gone and `worktrees/<id>` could be\n \tremoved. The file's content contains a reason string on why\n \tthe repository is locked.\n \n-- \n2.5.0.rc2.386.g87d813d\n"},{"id":"266472","messageId":"1437370162-8031-3-git-send-email-sunshine@sunshineco.com","threadId":"39898","inReplyTo":"1437370162-8031-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH v2 2/5] Documentation/git-worktree: fix incorrect reference to file \"locked\"","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-20T05:29:19Z","receivedAt":"2015-07-20T05:29:19Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"From: Michael Haggerty <mhagger@alum.mit.edu>\n\nThe administrative file to suppress pruning is named \"locked\", not \"lock\".\n\n[es: don't touch unrelated \"git worktree lock\" command; reword commit\nmessage]\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\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 60e5cf9..a6d8ad7 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.rc2.386.g87d813d\n"},{"id":"266476","messageId":"1437370162-8031-4-git-send-email-sunshine@sunshineco.com","threadId":"39898","inReplyTo":"1437370162-8031-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH v2 3/5] Documentation/config: fix stale \"git prune --worktree\" reference","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-20T05:29:20Z","receivedAt":"2015-07-20T05:29:20Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"From: Michael Haggerty <mhagger@alum.mit.edu>\n\nThis should have been changed to \"git worktree prune\" by df0b6cf\n(worktree: new place for \"git prune --worktrees\", 2015-06-29)\n\n[es: reword commit message]\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n Documentation/config.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 3e37b93..7f65dbb 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1293,7 +1293,7 @@ gc.pruneExpire::\n \n gc.pruneWorktreesExpire::\n \tWhen 'git gc' is run, it will call\n-\t'prune --worktrees --expire 3.months.ago'.\n+\t'git worktree prune --expire 3.months.ago'.\n \tOverride the grace period with this config variable. The value\n \t\"now\" may be used to disable the grace period and prune\n \t$GIT_DIR/worktrees immediately.\n-- \n2.5.0.rc2.386.g87d813d\n"},{"id":"266475","messageId":"1437370162-8031-5-git-send-email-sunshine@sunshineco.com","threadId":"39898","inReplyTo":"1437370162-8031-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH v2 4/5] Documentation/git-worktree: wordsmith worktree-related manpages","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-20T05:29:21Z","receivedAt":"2015-07-20T05:29:21Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"From: Michael Haggerty <mhagger@alum.mit.edu>\n\n[es: reword .git/worktrees and .git/worktrees/<id>/locked descriptions]\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n Documentation/config.txt               |  8 ++++----\n Documentation/gitrepository-layout.txt | 16 ++++++++--------\n 2 files changed, 12 insertions(+), 12 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 7f65dbb..10bc351 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1292,11 +1292,11 @@ gc.pruneExpire::\n \tunreachable objects immediately.\n \n gc.pruneWorktreesExpire::\n-\tWhen 'git gc' is run, it will call\n+\tWhen 'git gc' is run, it calls\n \t'git worktree prune --expire 3.months.ago'.\n-\tOverride the grace period with this config variable. The value\n-\t\"now\" may be used to disable the grace period and prune\n-\t$GIT_DIR/worktrees immediately.\n+\tThis config variable can be used to set a different grace\n+\tperiod. The value \"now\" may be used to disable the grace\n+\tperiod and prune $GIT_DIR/worktrees immediately.\n \n gc.reflogExpire::\n gc.<pattern>.reflogExpire::\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex b53979c..577ee84 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -251,25 +251,25 @@ modules::\n \tContains the git-repositories of the submodules.\n \n worktrees::\n-\tContains working tree specific information of linked\n+\tContains administrative data for linked\n \tworking trees. Each subdirectory contains the working tree-related\n \tpart of a linked working tree. This directory is ignored if\n-\t$GIT_COMMON_DIR is set and \"$GIT_COMMON_DIR/worktrees\" will be\n-\tused instead.\n+\t$GIT_COMMON_DIR is set, in which case\n+\t\"$GIT_COMMON_DIR/worktrees\" will be used instead.\n \n worktrees/<id>/gitdir::\n \tA text file containing the absolute path back to the .git file\n \tthat points to here. This is used to check if the linked\n \trepository has been manually removed and there is no need to\n-\tkeep this directory any more. mtime of this file should be\n+\tkeep this directory any more. The mtime of this file should be\n \tupdated every time the linked repository is accessed.\n \n worktrees/<id>/locked::\n \tIf this file exists, the linked working tree may be on a\n-\tportable device and not available. It does not mean that the\n-\tlinked working tree is gone and `worktrees/<id>` could be\n-\tremoved. The file's content contains a reason string on why\n-\tthe repository is locked.\n+\tportable device and not available. The presence of this file\n+\tprevents `worktrees/<id>` from being pruned either automatically\n+\tor manually by `git worktree prune`. The file may contain a string\n+\texplaining why the repository is locked.\n \n worktrees/<id>/link::\n \tIf this file exists, it is a hard link to the linked .git\n-- \n2.5.0.rc2.386.g87d813d\n"},{"id":"266473","messageId":"1437370162-8031-6-git-send-email-sunshine@sunshineco.com","threadId":"39898","inReplyTo":"1437370162-8031-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH v2 5/5] config: rename \"gc.pruneWorktreesExpire\" to \"gc.worktreePruneExpire\"","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-20T05:29:22Z","receivedAt":"2015-07-20T05:29:22Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"As of df0b6cf (worktree: new place for \"git prune --worktrees\",\n2015-06-29), linked worktree pruning functionality moved from\n\"git prune --worktrees\" to \"git worktree prune\". Rename the\nassociated configuration variable accordingly.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n\nI'm not convinced this is worth the churn. Can be easily dropped if not\ndeemed worthwhile.\n\n Documentation/config.txt       | 2 +-\n Documentation/git-worktree.txt | 2 +-\n builtin/gc.c                   | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 10bc351..746d292 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1291,7 +1291,7 @@ gc.pruneExpire::\n \t\"now\" may be used to disable this  grace period and always prune\n \tunreachable objects immediately.\n \n-gc.pruneWorktreesExpire::\n+gc.worktreePruneExpire::\n \tWhen 'git gc' is run, it calls\n \t'git worktree prune --expire 3.months.ago'.\n \tThis config variable can be used to set a different grace\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex a6d8ad7..3234459 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -27,7 +27,7 @@ bare repository) and zero or more linked working trees.\n When you are done with a linked working tree you can simply delete it.\n The working tree's administrative files in the repository (see\n \"DETAILS\" below) will eventually be removed automatically (see\n-`gc.pruneworktreesexpire` in linkgit::git-config[1]), or you can run\n+`gc.worktreePruneExpire` in linkgit::git-config[1]), or you can run\n `git worktree prune` in the main or any linked working tree to\n clean up any stale administrative files.\n \ndiff --git a/builtin/gc.c b/builtin/gc.c\nindex 4957c39..bcc75d9 100644\n--- a/builtin/gc.c\n+++ b/builtin/gc.c\n@@ -85,7 +85,7 @@ static void gc_config(void)\n \tgit_config_get_int(\"gc.autopacklimit\", &gc_auto_pack_limit);\n \tgit_config_get_bool(\"gc.autodetach\", &detach_auto);\n \tgit_config_date_string(\"gc.pruneexpire\", &prune_expire);\n-\tgit_config_date_string(\"gc.pruneworktreesexpire\", &prune_worktrees_expire);\n+\tgit_config_date_string(\"gc.worktreepruneexpire\", &prune_worktrees_expire);\n \tgit_config(git_default_config, NULL);\n }\n \n-- \n2.5.0.rc2.386.g87d813d\n"},{"id":"266490","messageId":"55AD146D.3080509@alum.mit.edu","threadId":"39898","inReplyTo":"1437370162-8031-1-git-send-email-sunshine@sunshineco.com","subject":"Re: [PATCH v2 0/5] mh: worktree-related doc fixes","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2015-07-20T15:31:57Z","receivedAt":"2015-07-20T15:31:57Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"On 07/19/2015 10:29 PM, Eric Sunshine wrote:\n> This re-roll of Michael Haggerty's worktree-related documentation\n> tweaks[1] takes my review comments into account and adds one new patch.\n\nEric,\n\nThanks for separating the wheat from the chaff. I'm still traveling,\nwhich I'll claim as an excuse for my poor responsiveness.\n\nAll of your changes look good.\n\nI was wondering one thing: is there a value like \"never\" or \"false\" to\nwhich \"gc.worktreepruneexpire\" can be set to turn off pruning entirely?\nIf so, it might be nice to mention it in the config manpage. Similarly\nfor the other expiration grace time settings.\n\nBut it's definitely not a blocker.\n\nMichael\n\n-- \nMichael Haggerty\nmhagger@alum.mit.edu\n"},{"id":"266691","messageId":"CAPig+cRLZiLSrMDiPp9ZJ1RKELSEKqVc0K2h4CvnvXNk5t7aBw@mail.gmail.com","threadId":"39898","inReplyTo":"55AD146D.3080509@alum.mit.edu","subject":"Re: [PATCH v2 0/5] mh: worktree-related doc fixes","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T00:10:26Z","receivedAt":"2015-07-24T00:10:26Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Jul 20, 2015 at 11:31 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:\n> On 07/19/2015 10:29 PM, Eric Sunshine wrote:\n>> This re-roll of Michael Haggerty's worktree-related documentation\n>> tweaks[1] takes my review comments into account and adds one new patch.\n>\n> Thanks for separating the wheat from the chaff. I'm still traveling,\n> which I'll claim as an excuse for my poor responsiveness.\n>\n> All of your changes look good.\n>\n> I was wondering one thing: is there a value like \"never\" or \"false\" to\n> which \"gc.worktreepruneexpire\" can be set to turn off pruning entirely?\n> If so, it might be nice to mention it in the config manpage. Similarly\n> for the other expiration grace time settings.\n> But it's definitely not a blocker.\n\nI browsed the code for the various \"expire\" settings, and it appears\nthat they all accept and respect \"now\" and \"never\", as well, so I'll\nput together a patch as suggested.\n"},{"id":"266694","messageId":"xmqqh9ounzrs.fsf@gitster.dls.corp.google.com","threadId":"39898","inReplyTo":"CAPig+cRLZiLSrMDiPp9ZJ1RKELSEKqVc0K2h4CvnvXNk5t7aBw@mail.gmail.com","subject":"Re: [PATCH v2 0/5] mh: worktree-related doc fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-24T00:51:51Z","receivedAt":"2015-07-24T00:51:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n> On Mon, Jul 20, 2015 at 11:31 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:\n>> On 07/19/2015 10:29 PM, Eric Sunshine wrote:\n>>> This re-roll of Michael Haggerty's worktree-related documentation\n>>> tweaks[1] takes my review comments into account and adds one new patch.\n>>\n>> Thanks for separating the wheat from the chaff. I'm still traveling,\n>> which I'll claim as an excuse for my poor responsiveness.\n>>\n>> All of your changes look good.\n>>\n>> I was wondering one thing: is there a value like \"never\" or \"false\" to\n>> which \"gc.worktreepruneexpire\" can be set to turn off pruning entirely?\n>> If so, it might be nice to mention it in the config manpage. Similarly\n>> for the other expiration grace time settings.\n>> But it's definitely not a blocker.\n>\n> I browsed the code for the various \"expire\" settings, and it appears\n> that they all accept and respect \"now\" and \"never\", as well, so I'll\n> put together a patch as suggested.\n\nSounds good; thanks.\n"}]}