diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2019-08-05 08:02:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-05 21:31:24 (GMT) |
| commit | 39d88318569188c0544c3c0f8207f2e1b1829e60 (patch) | |
| tree | ba525e2b565e8c36d79be3b0d1666b1af90f1c19 /builtin | |
| parent | 9916073be5dc59997e7cb9f7577bc7c91fd8f44a (diff) | |
| download | git-39d88318569188c0544c3c0f8207f2e1b1829e60.zip git-39d88318569188c0544c3c0f8207f2e1b1829e60.tar.gz git-39d88318569188c0544c3c0f8207f2e1b1829e60.tar.bz2 | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit-graph.c | 6 | ||||
| -rw-r--r-- | builtin/gc.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 38027b8..64eccde 100644 --- 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; - 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, @@ -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) - flags |= COMMIT_GRAPH_APPEND; + flags |= COMMIT_GRAPH_WRITE_APPEND; if (opts.split) - flags |= COMMIT_GRAPH_SPLIT; + flags |= COMMIT_GRAPH_WRITE_SPLIT; read_replace_refs = 0; diff --git a/builtin/gc.c b/builtin/gc.c index c18efad..305fb0f 100644 --- 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(), - !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0, + !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0, NULL)) return 1; |