mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eric Sunshine
2015-07-20 01:29:22 -04:00
committed by Junio C Hamano
parent b07244f4c3
commit 114ff8881a
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config.txt
View File

@ -1229,8 +1229,7 @@ gc.pruneexpire::
"now" may be used to disable this grace period and always prune "now" may be used to disable this grace period and always prune
unreachable objects immediately. unreachable objects immediately.
gc.pruneworktreesexpire:: gc.worktreePruneExpire::
When 'git gc' is run, it will call
When 'git gc' is run, it calls When 'git gc' is run, it calls
'git worktree prune --expire 3.months.ago'. 'git worktree prune --expire 3.months.ago'.
This config variable can be used to set a different grace This config variable can be used to set a different grace

2
Documentation/git-worktree.txt
View File

@ -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. When you are done with a linked working tree you can simply delete it.
The working tree's administrative files in the repository (see The working tree's administrative files in the repository (see
"DETAILS" below) will eventually be removed automatically (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 `git worktree prune` in the main or any linked working tree to
clean up any stale administrative files. clean up any stale administrative files.

2
builtin/gc.c
View File

@ -85,7 +85,7 @@ static void gc_config(void)
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit); git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
git_config_get_bool("gc.autodetach", &detach_auto); git_config_get_bool("gc.autodetach", &detach_auto);
git_config_date_string("gc.pruneexpire", &prune_expire); 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);
} }