diff options
| author | Elijah Newren <newren@gmail.com> | 2026-02-21 23:59:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-21 18:34:07 -0800 |
| commit | 59257224a34824b948bf3941d66168deeec1dca8 (patch) | |
| tree | 96634e43cd5d7502a9d3457d57bf995235f986c2 | |
| parent | 5eae39beb10efeff23c58c1a9f4665ed4c498065 (diff) | |
| download | git-59257224a34824b948bf3941d66168deeec1dca8.tar.xz | |
merge-ort: prevent the_repository from coming back
Due to the use of DEFAULT_ABBREV, we cannot get rid of our usage of
USE_THE_REPOSITORY_VARIABLE. However, we have removed all other uses of
the_repository in merge-ort a few times. But they keep coming back.
Define the_repository to make it a compilation error so that they don't
come back any more.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-ort.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 60b4675f39..00923ce3cd 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -54,6 +54,14 @@ #include "xdiff-interface.h" /* + * We technically need USE_THE_REPOSITORY_VARIABLE above for DEFAULT_ABBREV, + * but do not want more uses of the_repository. Prevent them. + * + * opt->repo is available; use it instead. + */ +#define the_repository DO_NOT_USE_THE_REPOSITORY + +/* * We have many arrays of size 3. Whenever we have such an array, the * indices refer to one of the sides of the three-way merge. This is so * pervasive that the constants 0, 1, and 2 are used in many places in the |