From: Junio C Hamano Date: Wed, 10 Jun 2026 13:01:03 GMT Subject: Re: [PATCH] read_gitfile_gently(): return non-repo path on error Message-ID: In-Reply-To: Patrick Steinhardt writes: > On Tue, Jun 02, 2026 at 02:11:59AM -0400, Jeff King wrote: > [snip] >> Two other points of interest. >> >> One, I'm not sure how useful printing the pointed-to directory is. We >> _could_ just say: >> >> fatal: gitfile does not point to a valid repository: /path/to/.git >> >> which is enough for somebody to investigate themselves. That would >> certainly make the patch smaller. > > I have to agree that the patch is somewhat gross, and I myself don't > really see much of an issue to move to an error message like the above > if it ends up simplifying the logic. So we are in agreement among three of us that simplifying the code to lose error message with dubious value would be a good way forward. Peff, can we have a formal [v2] then? >> diff --git a/setup.c b/setup.c >> index 075bf89fa9..2df6fbf595 100644 >> --- a/setup.c >> +++ b/setup.c >> @@ -1641,9 +1650,11 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir, >> return GIT_DIR_INVALID_GITFILE; >> default: >> if (die_on_error) >> - read_gitfile_error_die(error_code, dir->buf, NULL); >> - else >> + read_gitfile_error_die(error_code, dir->buf, error_dst); >> + else { >> + free(error_dst); >> return GIT_DIR_INVALID_GITFILE; >> + } > > The `if` branch should also gain some curly braces here. True. Thanks.