Skip to content

Commit 114ff88

Browse files
sunshinecogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b07244f commit 114ff88

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

Documentation/config.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,8 +1229,7 @@ gc.pruneexpire::
12291229
"now" may be used to disable this grace period and always prune
12301230
unreachable objects immediately.
12311231

1232-
gc.pruneworktreesexpire::
1233-
When 'git gc' is run, it will call
1232+
gc.worktreePruneExpire::
12341233
When 'git gc' is run, it calls
12351234
'git worktree prune --expire 3.months.ago'.
12361235
This config variable can be used to set a different grace

Documentation/git-worktree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bare repository) and zero or more linked working trees.
2727
When you are done with a linked working tree you can simply delete it.
2828
The working tree's administrative files in the repository (see
2929
"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
3131
`git worktree prune` in the main or any linked working tree to
3232
clean up any stale administrative files.
3333

builtin/gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static void gc_config(void)
8585
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
8686
git_config_get_bool("gc.autodetach", &detach_auto);
8787
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);
8989
git_config(git_default_config, NULL);
9090
}
9191

0 commit comments

Comments
 (0)