config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0f70cf6141baff2b0694ab67e3c4c7a9fd13f25f..583d24fda4054093c2ba7780581c5414dd983b2f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1229,8 +1229,7 @@ gc.pruneexpire::
        "now" may be used to disable this  grace period and always prune
        unreachable objects immediately.
 
        "now" may be used to disable this  grace period and always prune
        unreachable objects immediately.
 

-gc.pruneworktreesexpire::
-       When 'git gc' is run, it will call
+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
        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 a6d8ad763a698a5d28068bbc976dff37eb80cef3..32344598c3de54b17b9ae1f73d908252e354192b 100644 (file)
--- 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
 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.
 
 `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 44b206acad36393a4158c5e440b1ec5ca4924bc1..5ae95cd46646bca4786e06db932af4fb808217d7 100644 (file)
--- 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_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);
 }
 
        git_config(git_default_config, NULL);
 }