diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2015-07-20 01:29:22 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:09:06 -0700 |
| commit | 114ff8881ac3de4b97f62f014560c99bed5dab92 (patch) | |
| tree | bd6d8b425ddc0b95febe472ddf8a70a70aceb774 | |
| parent | b07244f4c38326ed6da731aa0d4862905cd58daa (diff) | |
| download | git-114ff8881ac3de4b97f62f014560c99bed5dab92.tar.gz | |
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>
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-worktree.txt | 2 | ||||
| -rw-r--r-- | builtin/gc.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0f70cf6141..583d24fda4 100644 --- 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. -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 diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index a6d8ad763a..32344598c3 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 44b206acad..5ae95cd466 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); } |