Re: [PATCH] copy: drop dependency on `the_repository`

[Patrick Steinhardt <ps@pks.im>]

On Thu, Jul 16, 2026 at 02:41:44PM +0100, Phillip Wood wrote:
> > diff --git a/sequencer.c b/sequencer.c
> > index 1355a99a09..c9ede9c02d 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -2419,7 +2419,7 @@ static int do_pick_commit(struct repository *r,
> >   		} else {
> >   			const char *dest = git_path_squash_msg(r);
> >   			unlink(dest);
> > -			if (copy_file(dest, rebase_path_squash_msg(), 0666)) {
> > +			if (copy_file(the_repository, dest, rebase_path_squash_msg(), 0666)) {
> 
> The path for "dest" is obtained using a local repository instance "r", but
> we're using "the_repository" to set the permissions on that path. While that
> matches the current behavior it is clearly better to use the same repository
> instance to obtain both the path and and permissions for that path. In the
> hunk below we even have "the_repository" and "r" on the same line which
> seems confusing. This patch uses a local repository instance in
> refs/files-backend.c and setup.c, lets do the same here.

Makes sense. In that case though I'll also adapt the two uses of
`the_repository` below. Thanks!

Patrick

> > @@ -3864,11 +3864,11 @@ static int error_failed_squash(struct repository *r,
> >   			       int subject_len,
> >   			       const char *subject)
> >   {
> > -	if (copy_file(rebase_path_message(), rebase_path_squash_msg(), 0666))
> > +	if (copy_file(the_repository, rebase_path_message(), rebase_path_squash_msg(), 0666))
> >   		return error(_("could not copy '%s' to '%s'"),
> >   			rebase_path_squash_msg(), rebase_path_message());
> >   	unlink(git_path_merge_msg(r));
> > -	if (copy_file(git_path_merge_msg(r), rebase_path_message(), 0666))
> > +	if (copy_file(the_repository, git_path_merge_msg(r), rebase_path_message(), 0666))
> >   		return error(_("could not copy '%s' to '%s'"),
> >   			     rebase_path_message(),
> >   			     git_path_merge_msg(r));