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>
Eric Sunshine committed
Jul 20, 2015 at 01:29 UTC
114ff8881ac3de4b97f62f014560c99bed5dab92
3 files changed
+3
-4
Documentation/config.txt
+1
-2
@@ -1229,8 +1229,7 @@ gc.pruneexpire::
1229
"now" may be used to disable this grace period and always prune
1230
unreachable objects immediately.
1231
1232
-gc.pruneworktreesexpire::
1233
- When 'git gc' is run, it will call
1232
+gc.worktreePruneExpire::
1233
When 'git gc' is run, it calls
1234
'git worktree prune --expire 3.months.ago'.
1235
This config variable can be used to set a different grace
Documentation/git-worktree.txt
+1
-1
@@ -27,7 +27,7 @@ bare repository) and zero or more linked working trees.
27
When you are done with a linked working tree you can simply delete it.
28
The working tree's administrative files in the repository (see
29
"DETAILS" below) will eventually be removed automatically (see
30
-`gc.pruneworktreesexpire` in linkgit::git-config[1]), or you can run
30
+`gc.worktreePruneExpire` in linkgit::git-config[1]), or you can run
31
`git worktree prune` in the main or any linked working tree to
32
clean up any stale administrative files.
33
builtin/gc.c
+1
-1
@@ -85,7 +85,7 @@ static void gc_config(void)
85
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
86
git_config_get_bool("gc.autodetach", &detach_auto);
87
git_config_date_string("gc.pruneexpire", &prune_expire);
88
- git_config_date_string("gc.pruneworktreesexpire", &prune_worktrees_expire);
88
+ git_config_date_string("gc.worktreepruneexpire", &prune_worktrees_expire);
89
git_config(git_default_config, NULL);
90
}
91