[PATCH v2 5/5] config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 20, 2015, 05:29 UTC
- Message-ID
- <1437370162-8031-6-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1437370162-8031-1-git-send-email-sunshine@sunshineco.com>
As of df0b6cf (worktree: new place for "git prune --worktrees", 2015-06-29), linked worktree pruning functionality moved from "git prune --worktrees" to "git worktree prune". Rename the associated configuration variable accordingly.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> ---
I'm not convinced this is worth the churn. Can be easily dropped if not deemed worthwhile.
Documentation/config.txt | 2 +- Documentation/git-worktree.txt | 2 +- builtin/gc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index 10bc351..746d292 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1291,7 +1291,7 @@ gc.pruneExpire:: "now" may be used to disable this grace period and always prune unreachable objects immediately. -gc.pruneWorktreesExpire:: +gc.worktreePruneExpire:: When 'git gc' is run, it calls 'git worktree prune --expire 3.months.ago'. This config variable can be used to set a different grace diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index a6d8ad7..3234459 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -27,7 +27,7 @@ bare repository) and zero or more linked working trees. When you are done with a linked working tree you can simply delete it. The working tree's administrative files in the repository (see "DETAILS" below) will eventually be removed automatically (see -`gc.pruneworktreesexpire` in linkgit::git-config[1]), or you can run +`gc.worktreePruneExpire` in linkgit::git-config[1]), or you can run `git worktree prune` in the main or any linked working tree to clean up any stale administrative files. diff --git a/builtin/gc.c b/builtin/gc.c index 4957c39..bcc75d9 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -85,7 +85,7 @@ static void gc_config(void) git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit); git_config_get_bool("gc.autodetach", &detach_auto); git_config_date_string("gc.pruneexpire", &prune_expire); - git_config_date_string("gc.pruneworktreesexpire", &prune_worktrees_expire); + git_config_date_string("gc.worktreepruneexpire", &prune_worktrees_expire); git_config(git_default_config, NULL); }
-- 2.5.0.rc2.386.g87d813d