summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-06-29 12:51:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-29 15:48:44 (GMT)
commitdf0b6cfbda88144714541664fb501146d6465a82 (patch)
tree9acade77a77e010352979754ed9427b0b3ca9f1a /builtin/gc.c
parente1c1ab9d25864e8de0009f3f3149ec4386a14bf8 (diff)
downloadgit-df0b6cfbda88144714541664fb501146d6465a82.zip
git-df0b6cfbda88144714541664fb501146d6465a82.tar.gz
git-df0b6cfbda88144714541664fb501146d6465a82.tar.bz2
worktree: new place for "git prune --worktrees"
Commit 23af91d (prune: strategies for linked checkouts - 2014-11-30) adds "--worktrees" to "git prune" without realizing that "git prune" is for object database only. This patch moves the same functionality to a new command "git worktree". Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.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 fa87ad3..44b206a 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -293,7 +293,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
argv_array_pushl(&reflog, "reflog", "expire", "--all", NULL);
argv_array_pushl(&repack, "repack", "-d", "-l", NULL);
argv_array_pushl(&prune, "prune", "--expire", NULL);
- argv_array_pushl(&prune_worktrees, "prune", "--worktrees", "--expire", NULL);
+ argv_array_pushl(&prune_worktrees, "worktree", "prune", "--expire", NULL);
argv_array_pushl(&rerere, "rerere", "gc", NULL);
gc_config();