aboutsummaryrefslogtreecommitdiffstats
path: root/graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-01-21 08:44:54 -0800
committerJunio C Hamano <gitster@pobox.com>2025-01-21 08:44:54 -0800
commit7b39a128c814a2362d0533c7df0ab7a2fef6fa4b (patch)
tree6f348b269516bb30655e03ef6a637609d007c5d2 /graph.c
parentMerge branch 'jt/fsck-skiplist-parse-fix' (diff)
parentmatch-trees: stop using `the_repository` (diff)
downloadgit-7b39a128c814a2362d0533c7df0ab7a2fef6fa4b.tar.gz
git-7b39a128c814a2362d0533c7df0ab7a2fef6fa4b.zip
Merge branch 'ps/the-repository'
More code paths have a repository passed through the callchain, instead of assuming the primary the_repository object. * ps/the-repository: match-trees: stop using `the_repository` graph: stop using `the_repository` add-interactive: stop using `the_repository` tmp-objdir: stop using `the_repository` resolve-undo: stop using `the_repository` credential: stop using `the_repository` mailinfo: stop using `the_repository` diagnose: stop using `the_repository` server-info: stop using `the_repository` send-pack: stop using `the_repository` serve: stop using `the_repository` trace: stop using `the_repository` pager: stop using `the_repository` progress: stop using `the_repository`
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/graph.c b/graph.c
index 52205f75c3..26f6fbf000 100644
--- a/graph.c
+++ b/graph.c
@@ -1,4 +1,3 @@
-#define USE_THE_REPOSITORY_VARIABLE
#define DISABLE_SIGN_COMPARE_WARNINGS
#include "git-compat-util.h"
@@ -351,7 +350,7 @@ struct git_graph *graph_init(struct rev_info *opt)
if (!column_colors) {
char *string;
- if (git_config_get_string("log.graphcolors", &string)) {
+ if (repo_config_get_string(opt->repo, "log.graphcolors", &string)) {
/* not configured -- use default */
graph_set_column_colors(column_colors_ansi,
column_colors_ansi_max);