aboutsummaryrefslogtreecommitdiffstats
path: root/graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-01 13:39:56 -0700
committerJunio C Hamano <gitster@pobox.com>2020-05-01 13:39:56 -0700
commitbf04590ecdf87d0ad034f7fbff36a10eb20637cb (patch)
tree0eec97b7ca3c86fffe3d510ed124789d09c77a5a /graph.c
parentMerge branch 'mt/doc-worktree-ref' (diff)
parentprogress.c: silence cgcc suggestion about internal linkage (diff)
downloadgit-bf04590ecdf87d0ad034f7fbff36a10eb20637cb.tar.gz
git-bf04590ecdf87d0ad034f7fbff36a10eb20637cb.zip
Merge branch 'dd/sparse-fixes'
Compilation fix. * dd/sparse-fixes: progress.c: silence cgcc suggestion about internal linkage graph.c: limit linkage of internal variable compat/regex: move stdlib.h up in inclusion chain test-parse-pathspec-file.c: s/0/NULL/ for pointer type
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/graph.c b/graph.c
index 4fb25ad464..4cd9915075 100644
--- a/graph.c
+++ b/graph.c
@@ -1055,7 +1055,7 @@ static void graph_output_commit_line(struct git_graph *graph, struct graph_line
graph_update_state(graph, GRAPH_COLLAPSING);
}
-const char merge_chars[] = {'/', '|', '\\'};
+static const char merge_chars[] = {'/', '|', '\\'};
static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line)
{