From: Junio C Hamano Date: Fri, 10 Jul 2026 16:57:09 GMT Subject: Re: [PATCH 0/7] refs: remove use of `the_repository` Message-ID: In-Reply-To: Patrick Steinhardt writes: > Hm, curious, I cannot reproduce any of these failures at all, everything > is passing locally when merging "seen" into my branch. Did you maybe > mismerge the changes in "setup.c" by accident? That seems like the most > likely reason as you mention that it breaks lots of tests, and "setup.c" > is of course involved with all of them. It is more than probable that it was what happened. Will retry the merge during the integration run I'll make later today. Thanks. > > For reference, this is what the final result of the conflicting part > looks like on my side: > > if (real_git_dir) { > struct stat st; > > if (!exist_ok && !stat(git_dir, &st)) > die(_("%s already exists"), git_dir); > > if (!exist_ok && !stat(real_git_dir, &st)) > die(_("%s already exists"), real_git_dir); > > apply_and_export_relative_gitdir(repo, real_git_dir, 1); > git_dir = repo_get_git_dir(repo); > separate_git_dir(repo, git_dir, original_git_dir); > } else { > apply_and_export_relative_gitdir(repo, git_dir, 1); > git_dir = repo_get_git_dir(repo); > } > > Thanks! > > Patrick