diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-23 05:40:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-23 05:40:30 (GMT) |
| commit | 02a20456d2c5efccbdd0093ad2a16134f160c218 (patch) | |
| tree | 7377c60146663d9a6402d6742be92591eefa07b2 /builtin-prune-packed.c | |
| parent | 87b787ac77e0d8f81468dcba2a39c9d0287870c3 (diff) | |
| parent | 0abc0260fa3419de649fcc1444e3d256a17ca6c7 (diff) | |
| download | git-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-packed.c')
| -rw-r--r-- | builtin-prune-packed.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c index 960db49..e12b6cf 100644 --- a/builtin-prune-packed.c +++ b/builtin-prune-packed.c @@ -4,9 +4,7 @@ static const char prune_packed_usage[] = "git-prune-packed [-n]"; -static int dryrun; - -static void prune_dir(int i, DIR *dir, char *pathname, int len) +static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun) { struct dirent *de; char hex[40]; @@ -31,7 +29,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len) rmdir(pathname); } -static void prune_packed_objects(void) +void prune_packed_objects(int dryrun) { int i; static char pathname[PATH_MAX]; @@ -50,7 +48,7 @@ static void prune_packed_objects(void) d = opendir(pathname); if (!d) continue; - prune_dir(i, d, pathname, len + 3); + prune_dir(i, d, pathname, len + 3, dryrun); closedir(d); } } @@ -58,6 +56,7 @@ static void prune_packed_objects(void) int cmd_prune_packed(int argc, const char **argv, const char *prefix) { int i; + int dryrun; for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -73,6 +72,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix) usage(prune_packed_usage); } sync(); - prune_packed_objects(); + prune_packed_objects(dryrun); return 0; } |