diff options
| author | John Cai <johncai86@gmail.com> | 2024-09-13 21:16:15 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-13 14:32:24 -0700 |
| commit | 03eae9afb447ad4add2f18a1adb3589f050d596f (patch) | |
| tree | ebabe6ee0ab1b62f7839adf730c6f2a783809d93 /builtin/merge.c | |
| parent | 9b1cb5070ffb581798763eaee85cec10da969e90 (diff) | |
builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h
Instead of including USE_THE_REPOSITORY_VARIABLE by default on every
builtin, remove it from builtin.h and add it to all the builtins that
include builtin.h (by definition, that means all builtins/*.c).
Also, remove the include statement for repository.h since it gets
brought in through builtin.h.
The next step will be to migrate each builtin
from having to use the_repository.
Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index fd6dc00d6c..c54ac7b67c 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -5,8 +5,9 @@ * * Based on git-merge.sh by Junio C Hamano. */ - +#define USE_THE_REPOSITORY_VARIABLE #include "builtin.h" + #include "abspath.h" #include "advice.h" #include "config.h" |