summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-13 21:02:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-13 21:02:02 (GMT)
commit7783eb2e59684492e75068443e1f77f64fe37cc9 (patch)
tree28abef68309c3b2cfcb3398955eb3e2d63da5479 /builtin/gc.c
parent721f5bb8968ed6a6ec126fe28f679c17a6998e87 (diff)
parentdf0b6cfbda88144714541664fb501146d6465a82 (diff)
downloadgit-7783eb2e59684492e75068443e1f77f64fe37cc9.zip
git-7783eb2e59684492e75068443e1f77f64fe37cc9.tar.gz
git-7783eb2e59684492e75068443e1f77f64fe37cc9.tar.bz2
Merge branch 'nd/multiple-work-trees'
"git checkout [<tree-ish>] <paths>" spent unnecessary cycles checking if the current branch was checked out elsewhere, when we know we are not switching the branches ourselves. * nd/multiple-work-trees: worktree: new place for "git prune --worktrees" checkout: don't check worktrees when not necessary
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 36fe333..4957c39 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();