Skip to content

Commit 3249d07

Browse files
newrengitster
authored andcommitted
replay: 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. We have removed all other uses of the_repository before, but without removing that definition, they keep coming back. Define the_repository to make it a compilation error so that they don't come back any more; the repo parameter plumbed through the various functions can be used instead. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5925722 commit 3249d07

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

replay.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
#include "strmap.h"
1212
#include "tree.h"
1313

14+
/*
15+
* We technically need USE_THE_REPOSITORY_VARIABLE for DEFAULT_ABBREV, but
16+
* do not want to use the_repository.
17+
*/
18+
#define the_repository DO_NOT_USE_THE_REPOSITORY
19+
1420
static const char *short_commit_name(struct repository *repo,
1521
struct commit *commit)
1622
{

0 commit comments

Comments
 (0)