From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 28 Nov 2007 17:18:35 GMT
Subject: Re: [PATCH] Do check_repository_format() early
Message-ID: <Pine.LNX.4.64.0711281717460.27959@racer.site>
In-Reply-To: <fcaeb9bf0711280910x40fecdd5mf6d86e4a9b656d01@mail.gmail.com>

Hi,

On Thu, 29 Nov 2007, Nguyen Thai Ngoc Duy wrote:

> On Nov 29, 2007 12:05 AM, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> >
> > On Wed, 28 Nov 2007, Nguyen Thai Ngoc Duy wrote:
> >
> > > @@ -246,8 +246,13 @@ const char *setup_git_directory_gently(int *nongit_ok)
> > >                       static char buffer[1024 + 1];
> > >                       const char *retval;
> > >
> > > -                     if (!work_tree_env)
> > > -                             return set_work_tree(gitdirenv);
> > > +                     if (!work_tree_env) {
> > > +                             retval = set_work_tree(gitdirenv);
> > > +                             /* config may override worktree */
> > > +                             check_repository_format();
> > > +                             return retval;
> > > +                     }
> > > +                     check_repository_format();
> >
> > Why not move this check before the if?  Other than that, ACK.
> 
> If so it would be called twice if work_tree_env is not set.

Well, I would have left the original

			if (!work_tree_env)
				return set_work_tree(gitdirenv);

alone...

If that is not possible, it might be good to add a comment as to why.

Ciao,
Dscho