summaryrefslogtreecommitdiff
path: root/builtin-prune.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2006-10-22 23:01:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-22 23:39:58 (GMT)
commit2eb53e65bd9cdd3b76a6447a1a51dee6e5de96a3 (patch)
tree5ed2049d3c68eeac2575f6e53edf4aa846047ee1 /builtin-prune.c
parent474a90fef9ebcdedee041b2def4b9a98b94cd146 (diff)
downloadgit-2eb53e65bd9cdd3b76a6447a1a51dee6e5de96a3.zip
git-2eb53e65bd9cdd3b76a6447a1a51dee6e5de96a3.tar.gz
git-2eb53e65bd9cdd3b76a6447a1a51dee6e5de96a3.tar.bz2
Make prune also run prune-packed
Both the git-prune manpage and everday.txt say that git-prune should also prune unpacked objects that are also found in packs, by running git prune-packed. Junio thought this was "a regression when prune was rewritten as a built-in." So modify prune to call prune-packed again. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'builtin-prune.c')
-rw-r--r--builtin-prune.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-prune.c b/builtin-prune.c
index 6228c79..7290e6d 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -255,5 +255,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
prune_object_dir(get_object_directory());
+ sync();
+ prune_packed_objects(show_only);
return 0;
}