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

From

Junio C Hamano <gitster@pobox.com>

Date

Sep 13, 2011, 23:46 UTC

Message-ID

<7v62kwvwe9.fsf@alter.siamese.dyndns.org>

In-Reply-To

<4E6FDE71.9050606@ramsay1.demon.co.uk>

Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:

> Junio C Hamano wrote:
>> 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.

Thanks.

 environment.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/environment.c b/environment.c
index 478f2afa..e810f6b 100644
--- a/environment.c
+++ b/environment.c
@@ -147,6 +147,15 @@ int is_bare_repository(void)
 	return is_bare_repository_cfg && !get_git_work_tree();
 }
 
+/*
+ * This symbol might be unreferenced in normal builds but
+ * compat/cygwin.c refers to it. Do not remove without checking!
+ */
+int have_git_dir(void)
+{
+	return !!git_dir;
+}
+
 const char *get_git_dir(void)
 {
 	if (!git_dir)