summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-07-20 05:29:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-20 18:09:06 (GMT)
commit114ff8881ac3de4b97f62f014560c99bed5dab92 (patch)
treebd6d8b425ddc0b95febe472ddf8a70a70aceb774 /builtin/gc.c
parentb07244f4c38326ed6da731aa0d4862905cd58daa (diff)
downloadgit-114ff8881ac3de4b97f62f014560c99bed5dab92.zip
git-114ff8881ac3de4b97f62f014560c99bed5dab92.tar.gz
git-114ff8881ac3de4b97f62f014560c99bed5dab92.tar.bz2
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>
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 44b206a..5ae95cd 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);
}