diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-05-27 18:18:47 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-28 09:20:54 -0700 |
| commit | af0b4a3b5973ebdf8fcdedcccbc2e8ddb93c8534 (patch) | |
| tree | c1a085f90321ff0e5b0e64a4262c05893e55f8c8 /builtin/prune.c | |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 (diff) | |
| download | git-af0b4a3b5973ebdf8fcdedcccbc2e8ddb93c8534.tar.gz | |
prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
Commit b60daf0 (Make git-prune-packed a bit more chatty. - 2007-01-12)
changes the meaning of prune_packed_objects()'s argument, from "dry
run or not dry run" to a bitmap.
It however forgot to update prune_packed_objects() caller in
builtin/prune.c to use new DRY_RUN macro. It's fine (for a long time!)
but there is a risk that someday someone may change the value of
DRY_RUN to something else and builtin/prune.c suddenly breaks. Avoid
that possibility.
While at there, change "opts == VERBOSE" to "opts & VERBOSE" as there
is no obvious reason why we only be chatty when DRY_RUN is not set.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/prune.c')
| -rw-r--r-- | builtin/prune.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/prune.c b/builtin/prune.c index 85843d4f17..59d1fdcecf 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -165,7 +165,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) stop_progress(&progress); prune_object_dir(get_object_directory()); - prune_packed_objects(show_only); + prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0); remove_temporary_files(get_object_directory()); s = mkpathdup("%s/pack", get_object_directory()); remove_temporary_files(s); |