Re: [PATCH v2 1/8] discover_git_directory(): avoid setting invalid git_dir

From: Jeff King <peff@peff.net>
Date: Jun 10, 2017, 08:40 UTC
Message-ID: <20170610084015.ej62tkw7gb26z4no@sigill.intra.peff.net>
In-Reply-To: <effd58a564e54ccd3d695d91bc9c4f32255b8ab7.1496951503.git.johannes.schindelin@gmx.de>

On Thu, Jun 08, 2017 at 09:53:32PM +0200, Johannes Schindelin wrote:

Show 14 quoted lines

> When discovering a .git/ directory, we take pains to ensure that its
> repository format version matches Git's expectations, and we return NULL
> otherwise.
> 
> However, we still appended the invalid path to the strbuf passed as
> argument.
> 
> Let's just reset the strbuf to the state before we appended the .git/
> directory that was eventually rejected.
> 
> There is another early return path in that function, when
> setup_git_directory_gently_1() returns GIT_DIR_NONE or an error. In that
> case, the gitdir parameter has not been touched, therefore there is no
> need for an equivalent change in that code path.

After reading this, I thought at first this was a user-visible (albeit obscure) bug where something like:

  git init
  git init bogus
  cd bogus
  git config core.repositoryformatversion 5

would mean that early-config barfs on seeing our bogus ".git", but that screws up the discovery going back to the real repository root. But that's not the case, because we always stop walking anyway when we see such a bogus git dir.

So it's just a cleanup (though obviously a sensible one).

-Peff