commit-graph: turn a group of write-related macro flags into an enum

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 38027b83d9d8329a1dc2e47b236a985e4ce71060..64eccde314e57e76dac091a3da0347a4474c23ac 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -154,7 +154,7 @@ static int graph_write(int argc, const char **argv)
        struct string_list *commit_hex = NULL;
        struct string_list lines;
        int result = 0;
        struct string_list *commit_hex = NULL;
        struct string_list lines;
        int result = 0;

-       unsigned int flags = COMMIT_GRAPH_PROGRESS;
+       enum commit_graph_write_flags flags = COMMIT_GRAPH_WRITE_PROGRESS;

 
        static struct option builtin_commit_graph_write_options[] = {
                OPT_STRING(0, "object-dir", &opts.obj_dir,
 
        static struct option builtin_commit_graph_write_options[] = {
                OPT_STRING(0, "object-dir", &opts.obj_dir,


@@ -192,9 +192,9 @@ static int graph_write(int argc, const char **argv)
        if (!opts.obj_dir)
                opts.obj_dir = get_object_directory();
        if (opts.append)
        if (!opts.obj_dir)
                opts.obj_dir = get_object_directory();
        if (opts.append)

-               flags |= COMMIT_GRAPH_APPEND;
+               flags |= COMMIT_GRAPH_WRITE_APPEND;

        if (opts.split)
        if (opts.split)

-               flags |= COMMIT_GRAPH_SPLIT;
+               flags |= COMMIT_GRAPH_WRITE_SPLIT;

 
        read_replace_refs = 0;
 
 
        read_replace_refs = 0;
 

diff --git a/builtin/gc.c b/builtin/gc.c
index c18efadda53e54f0e80dbd16737e2d40f47fa16f..305fb0f45af3bdfc32e15bcc18acdcaa6af205cb 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -687,7 +687,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 
        if (gc_write_commit_graph &&
            write_commit_graph_reachable(get_object_directory(),
 
        if (gc_write_commit_graph &&
            write_commit_graph_reachable(get_object_directory(),

-                                        !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0,
+                                        !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,

                                         NULL))
                return 1;
 
                                         NULL))
                return 1;
 

diff --git a/commit-graph.c b/commit-graph.c
index b3c4de79b6da4502726dbec5e21b11734d76e28e..04324a464894e930173b7bb0bbea9cf264c0d316 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1133,7 +1133,8 @@ static int add_ref_to_list(const char *refname,
        return 0;
 }
 
        return 0;
 }
 

-int write_commit_graph_reachable(const char *obj_dir, unsigned int flags,
+int write_commit_graph_reachable(const char *obj_dir,
+                                enum commit_graph_write_flags flags,

                                 const struct split_commit_graph_opts *split_opts)
 {
        struct string_list list = STRING_LIST_INIT_DUP;
                                 const struct split_commit_graph_opts *split_opts)
 {
        struct string_list list = STRING_LIST_INIT_DUP;


@@ -1750,7 +1751,7 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
 int write_commit_graph(const char *obj_dir,
                       struct string_list *pack_indexes,
                       struct string_list *commit_hex,
 int write_commit_graph(const char *obj_dir,
                       struct string_list *pack_indexes,
                       struct string_list *commit_hex,

-                      unsigned int flags,
+                      enum commit_graph_write_flags flags,

                       const struct split_commit_graph_opts *split_opts)
 {
        struct write_commit_graph_context *ctx;
                       const struct split_commit_graph_opts *split_opts)
 {
        struct write_commit_graph_context *ctx;


@@ -1771,9 +1772,9 @@ int write_commit_graph(const char *obj_dir,
        if (len && ctx->obj_dir[len - 1] == '/')
                ctx->obj_dir[len - 1] = 0;
 
        if (len && ctx->obj_dir[len - 1] == '/')
                ctx->obj_dir[len - 1] = 0;
 

-       ctx->append = flags & COMMIT_GRAPH_APPEND ? 1 : 0;
-       ctx->report_progress = flags & COMMIT_GRAPH_PROGRESS ? 1 : 0;
-       ctx->split = flags & COMMIT_GRAPH_SPLIT ? 1 : 0;
+       ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
+       ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
+       ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;

        ctx->split_opts = split_opts;
 
        if (ctx->split) {
        ctx->split_opts = split_opts;
 
        if (ctx->split) {

diff --git a/commit-graph.h b/commit-graph.h
index df9a3b20e4abc7d388acab1cc85546aafa8345a3..ae4db87fb5e6dcaac185ae43204fad7dc90a55bd 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -71,9 +71,11 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,
  */
 int generation_numbers_enabled(struct repository *r);
 
  */
 int generation_numbers_enabled(struct repository *r);
 

-#define COMMIT_GRAPH_APPEND     (1 << 0)
-#define COMMIT_GRAPH_PROGRESS   (1 << 1)
-#define COMMIT_GRAPH_SPLIT      (1 << 2)
+enum commit_graph_write_flags {
+       COMMIT_GRAPH_WRITE_APPEND     = (1 << 0),
+       COMMIT_GRAPH_WRITE_PROGRESS   = (1 << 1),
+       COMMIT_GRAPH_WRITE_SPLIT      = (1 << 2)
+};

 
 struct split_commit_graph_opts {
        int size_multiple;
 
 struct split_commit_graph_opts {
        int size_multiple;


@@ -87,12 +89,13 @@ struct split_commit_graph_opts {
  * is not compatible with the commit-graph feature, then the
  * methods will return 0 without writing a commit-graph.
  */
  * is not compatible with the commit-graph feature, then the
  * methods will return 0 without writing a commit-graph.
  */

-int write_commit_graph_reachable(const char *obj_dir, unsigned int flags,
+int write_commit_graph_reachable(const char *obj_dir,
+                                enum commit_graph_write_flags flags,

                                 const struct split_commit_graph_opts *split_opts);
 int write_commit_graph(const char *obj_dir,
                       struct string_list *pack_indexes,
                       struct string_list *commit_hex,
                                 const struct split_commit_graph_opts *split_opts);
 int write_commit_graph(const char *obj_dir,
                       struct string_list *pack_indexes,
                       struct string_list *commit_hex,

-                      unsigned int flags,
+                      enum commit_graph_write_flags flags,

                       const struct split_commit_graph_opts *split_opts);
 
 #define COMMIT_GRAPH_VERIFY_SHALLOW    (1 << 0)
                       const struct split_commit_graph_opts *split_opts);
 
 #define COMMIT_GRAPH_VERIFY_SHALLOW    (1 << 0)