Merge branch 'tr/test-commit-only-on-orphan'

diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index 83382c1fe13e1f99aad4736993c08877c989a748..fa6ce42f44f82d34299f2dc0109be4d831cb3d48 100644 (file)
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -8,9 +8,6 @@ static const char * const prune_packed_usage[] = {
        NULL
 };
 
-#define DRY_RUN 01
-#define VERBOSE 02
-
 static struct progress *progress;
 
 static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
@@ -29,7 +26,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
                if (!has_sha1_pack(sha1))
                        continue;
                memcpy(pathname + len, de->d_name, 38);
-               if (opts & DRY_RUN)
+               if (opts & PRUNE_PACKED_DRY_RUN)
                        printf("rm -f %s\n", pathname);
                else
                        unlink_or_warn(pathname);
@@ -44,7 +41,7 @@ void prune_packed_objects(int opts)
        const char *dir = get_object_directory();
        int len = strlen(dir);
 
-       if (opts == VERBOSE)
+       if (opts & PRUNE_PACKED_VERBOSE)
                progress = start_progress_delay("Removing duplicate objects",
                        256, 95, 2);
 
@@ -71,10 +68,12 @@ void prune_packed_objects(int opts)
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
-       int opts = isatty(2) ? VERBOSE : 0;
+       int opts = isatty(2) ? PRUNE_PACKED_VERBOSE : 0;
        const struct option prune_packed_options[] = {
-               OPT_BIT('n', "dry-run", &opts, N_("dry run"), DRY_RUN),
-               OPT_NEGBIT('q', "quiet", &opts, N_("be quiet"), VERBOSE),
+               OPT_BIT('n', "dry-run", &opts, N_("dry run"),
+                       PRUNE_PACKED_DRY_RUN),
+               OPT_NEGBIT('q', "quiet", &opts, N_("be quiet"),
+                          PRUNE_PACKED_VERBOSE),
                OPT_END()
        };