aboutsummaryrefslogtreecommitdiffstats
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-04 08:10:32 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-04 08:10:33 -0700
commit540aaa607c5efcd94bb852a76a8ec3e07ea9a7bc (patch)
tree69a3a2e875a8c492109796db5db50bf53f1998dd /xdiff-interface.c
parentMerge branch 'kn/for-each-ref-skip-updates' (diff)
parentconfig: fix sign comparison warnings (diff)
downloadgit-540aaa607c5efcd94bb852a76a8ec3e07ea9a7bc.tar.gz
git-540aaa607c5efcd94bb852a76a8ec3e07ea9a7bc.zip
Merge branch 'ps/config-wo-the-repository'
The config API had a set of convenience wrapper functions that implicitly use the_repository instance; they have been removed and inlined at the calling sites. * ps/config-wo-the-repository: (21 commits) config: fix sign comparison warnings config: move Git config parsing into "environment.c" config: remove unused `the_repository` wrappers config: drop `git_config_set_multivar()` wrapper config: drop `git_config_get_multivar_gently()` wrapper config: drop `git_config_set_multivar_in_file_gently()` wrapper config: drop `git_config_set_in_file_gently()` wrapper config: drop `git_config_set()` wrapper config: drop `git_config_set_gently()` wrapper config: drop `git_config_set_in_file()` wrapper config: drop `git_config_get_bool()` wrapper config: drop `git_config_get_ulong()` wrapper config: drop `git_config_get_int()` wrapper config: drop `git_config_get_string()` wrapper config: drop `git_config_get_string()` wrapper config: drop `git_config_get_string_multi()` wrapper config: drop `git_config_get_value()` wrapper config: drop `git_config_get_value()` wrapper config: drop `git_config_get()` wrapper config: drop `git_config_clear()` wrapper ...
Diffstat (limited to 'xdiff-interface.c')
-rw-r--r--xdiff-interface.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 0e5d38c960..4971f722b3 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -2,6 +2,7 @@
#define DISABLE_SIGN_COMPARE_WARNINGS
#include "git-compat-util.h"
+#include "environment.h"
#include "gettext.h"
#include "config.h"
#include "hex.h"