From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Fri, 12 Mar 2010 03:35:25 GMT
Subject: Re: [PATCH 06/16] Use git_config_early() instead of git_config() during repo setup
Message-ID: <fcaeb9bf1003111935k7719c2a8r3e925f8ad2c12276@mail.gmail.com>
In-Reply-To: <1268313754-28179-7-git-send-email-pclouds@gmail.com>

2010/3/11 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>:
> @@ -411,6 +425,8 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
>                        inside_git_dir = 1;
>                        if (!work_tree_env)
>                                inside_work_tree = 0;
> +                       if (check_repository_format_gently(gitfile_dir, nongit_ok))
> +                               return NULL;
>                        if (offset != len) {
>                                root_len = offset_1st_component(cwd);
>                                cwd[offset > root_len ? offset : root_len] = '\0';

Something went wrong in rebases and conflicts. gitfile_dir in the
above call should be replaced by "."

if (check_repository_format_gently(".", nongit_ok))
-- 
Duy