[Outreachy PATCH] diffcore-rename: stop using the_repository

[Outreachy PATCH] diffcore-rename: stop using the_repository

[Okhuomon Ajayi]

diffcore_rename_extended() already has the repository through
options. Use its hash algorithm when checking for empty blobs,
and pass it to start_delayed_progress().

Remove the USE_THE_REPOSITORY_VARIABLE definition.

Signed-off-by: Okhuomon Ajayi <okhuomonajayi54@gmail.com>
---
 diffcore-rename.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/diffcore-rename.c b/diffcore-rename.c
index c797d8ed2f..f0ce6e14e5 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -3,8 +3,6 @@
  * Copyright (C) 2005 Junio C Hamano
  */
 
-#define USE_THE_REPOSITORY_VARIABLE
-
 #include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
@@ -1424,7 +1422,8 @@ void diffcore_rename_extended(struct diff_options *options,
 				 strcmp(options->single_follow, p->two->path))
 				continue; /* not interested */
 			else if (!options->flags.rename_empty &&
-				 is_empty_blob_oid(&p->two->oid, the_repository->hash_algo))
+				 is_empty_blob_oid(&p->two->oid,
+						   options->repo->hash_algo))
 				continue;
 			else if (add_rename_dst(p) < 0) {
 				warning("skipping rename detection, detected"
@@ -1434,7 +1433,8 @@ void diffcore_rename_extended(struct diff_options *options,
 			}
 		}
 		else if (!options->flags.rename_empty &&
-			 is_empty_blob_oid(&p->one->oid, the_repository->hash_algo))
+			 is_empty_blob_oid(&p->one->oid,
+					   options->repo->hash_algo))
 			continue;
 		else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
 			/*
@@ -1567,7 +1567,7 @@ void diffcore_rename_extended(struct diff_options *options,
 	trace2_region_enter("diff", "inexact renames", options->repo);
 	if (options->show_rename_progress) {
 		progress = start_delayed_progress(
-				the_repository,
+				options->repo,
 				_("Performing inexact rename detection"),
 				(uint64_t)num_destinations * (uint64_t)num_sources);
 	}

base-commit: 7e34d8174dcda3435d1404c9a30bef46afe6c13e
-- 
2.56.0

Re: [Outreachy PATCH] diffcore-rename: stop using the_repository

[Patrick Steinhardt]

On Sat, Oct 24, 2026 at 11:13:41PM +0100, Okhuomon Ajayi wrote:
> diffcore_rename_extended() already has the repository through
> options. Use its hash algorithm when checking for empty blobs,
> and pass it to start_delayed_progress().
> 
> Remove the USE_THE_REPOSITORY_VARIABLE definition.

All of the conversions are trivial, and we already dereference
`options->repo` unconditionally in this function. So the patch looks
trivially correct to me, nice!

Patrick

Re: [Outreachy PATCH] diffcore-rename: stop using the_repository

[Okhuomon Ajayi]

Thanks for the review, Patrick!

On Mon, Oct 26, 2026 at 11:52 AM Patrick Steinhardt <ps@pks.im> wrote:
>
> On Sat, Oct 24, 2026 at 11:13:41PM +0100, Okhuomon Ajayi wrote:
> > diffcore_rename_extended() already has the repository through
> > options. Use its hash algorithm when checking for empty blobs,
> > and pass it to start_delayed_progress().
> >
> > Remove the USE_THE_REPOSITORY_VARIABLE definition.
>
> All of the conversions are trivial, and we already dereference
> `options->repo` unconditionally in this function. So the patch looks
> trivially correct to me, nice!
>
> Patrick

Re: [Outreachy PATCH] diffcore-rename: stop using the_repository

[Patrick Steinhardt]

On Mon, Oct 26, 2026 at 12:22:59PM +0100, Okhuomon Ajayi wrote:
> Thanks for the review, Patrick!

Nit: please don't top-post, the expectation is to write your answer
below the parts you respond to. Thanks!

Patrick

> On Mon, Oct 26, 2026 at 11:52 AM Patrick Steinhardt <ps@pks.im> wrote:
> >
> > On Sat, Oct 24, 2026 at 11:13:41PM +0100, Okhuomon Ajayi wrote:
> > > diffcore_rename_extended() already has the repository through
> > > options. Use its hash algorithm when checking for empty blobs,
> > > and pass it to start_delayed_progress().
> > >
> > > Remove the USE_THE_REPOSITORY_VARIABLE definition.
> >
> > All of the conversions are trivial, and we already dereference
> > `options->repo` unconditionally in this function. So the patch looks
> > trivially correct to me, nice!
> >
> > Patrick

Re: [Outreachy PATCH] diffcore-rename: stop using the_repository

[Okhuomon Ajayi]

> Nit: please don't top-post, the expectation is to write your answer
> below the parts you respond to. Thanks!


 My bad i am sorry i forgot ;_;