From 03eae9afb447ad4add2f18a1adb3589f050d596f Mon Sep 17 00:00:00 2001 From: John Cai Date: Fri, 13 Sep 2024 21:16:15 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/merge-ours.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'builtin/merge-ours.c') diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 62267f12dd..1fcf53f005 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -7,10 +7,11 @@ * * Pretend we resolved the heads, but declare our tree trumps everybody else. */ +#define USE_THE_REPOSITORY_VARIABLE #include "git-compat-util.h" #include "builtin.h" #include "diff.h" -#include "repository.h" + static const char builtin_merge_ours_usage[] = "git merge-ours ... -- HEAD ..."; -- cgit 1.2.3-korg