Re: [PATCH 1/3] make-static: master

From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Sep 13, 2011, 22:51 UTC
Message-ID: <4E6FDE71.9050606@ramsay1.demon.co.uk>
In-Reply-To: <7vhb4in4j7.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 6 quoted lines

> Many symbols that are exported to the global scope do not have to be.
> 
> Signed-off-by: Junio C Hamano <junio@pobox.com>
> ---
>  * To be applied on top of 3793ac5 (RelNotes/1.7.7: minor fixes, 2011-09-07)
>

[snipped patch]

commit f34196da7b55cbf9f2651e095b6559430aff0baf (make-static: master, 11-09-2011) in the next branch (at repo.or.cz), but *not* this patch, breaks the build on cygwin.

The failure is caused by this part of the commit:

    diff --git a/environment.c b/environment.c
    index e96edcf..478f2afa 100644
    --- a/environment.c
    +++ b/environment.c
    @@ -147,11 +147,6 @@ int is_bare_repository(void)
            return is_bare_repository_cfg && !get_git_work_tree();
     }
    
    -int have_git_dir(void)
    -{
    -       return !!git_dir;
    -}
    -
     const char *get_git_dir(void)
     {
            if (!git_dir)

since have_git_dir() is used in compat/cygwin.c (line 117).

ATB, Ramsay Jones