kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
main
Elijah Newren 2026-02-21 23:59:52 +00:00 committed by Junio C Hamano
parent 5eae39beb1
commit 59257224a3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
merge-ort.c
View File

@ -53,6 +53,14 @@
#include "unpack-trees.h"
#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