diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-08-13 11:14:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-13 19:01:05 +0200 |
| commit | 219de841d9436d759fa52ea60625b60cda8476fd (patch) | |
| tree | 7c738cd9a5325d72ae375982fad9c0a0331442d8 /merge-ll.c | |
| parent | config: don't depend on `the_repository` with branch conditions (diff) | |
| download | git-219de841d9436d759fa52ea60625b60cda8476fd.tar.xz git-219de841d9436d759fa52ea60625b60cda8476fd.zip | |
global: prepare for hiding away repo-less config functions
We're about to hide config functions that implicitly depend on
`the_repository` behind the `USE_THE_REPOSITORY_VARIABLE` macro. This
will uncover a bunch of dependents that transitively relied on the
global variable, but didn't define the macro yet.
Adapt them such that we define the macro to prepare for this change.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ll.c')
| -rw-r--r-- | merge-ll.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-ll.c b/merge-ll.c index 180c19df67..badb6dea57 100644 --- a/merge-ll.c +++ b/merge-ll.c @@ -4,6 +4,8 @@ * Copyright (c) 2007 Junio C Hamano */ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "config.h" #include "convert.h" |