summaryrefslogtreecommitdiff
path: root/builtin-prune.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-23 05:40:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-23 05:40:30 (GMT)
commit02a20456d2c5efccbdd0093ad2a16134f160c218 (patch)
tree7377c60146663d9a6402d6742be92591eefa07b2 /builtin-prune.c
parent87b787ac77e0d8f81468dcba2a39c9d0287870c3 (diff)
parent0abc0260fa3419de649fcc1444e3d256a17ca6c7 (diff)
downloadgit-02a20456d2c5efccbdd0093ad2a16134f160c218.zip
git-02a20456d2c5efccbdd0093ad2a16134f160c218.tar.gz
git-02a20456d2c5efccbdd0093ad2a16134f160c218.tar.bz2
Merge branch 'maint'
* maint: pager: default to LESS=FRSX not LESS=FRS Make prune also run prune-packed git-vc: better installation instructions gitweb: Do not esc_html $basedir argument to git_print_tree_entry gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2) Fix usagestring for git-branch git-merge: show usage if run without arguments
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;
}