--- Begin Message ---
Subject: |
[PATCH] build: be more specific about .git directory before enabling warnings |
Date: |
Mon, 2 Jun 2014 09:54:56 +0100 |
* configure.ac: When looking for a .git checkout, restrict it to git
checkouts that contain a coreutils-specific tag.
Signed-off-by: Ben Walton <address@hidden>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a7a8bfc..96af9be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ AC_ARG_ENABLE([gcc-warnings],
# we're running from a git repo, then auto enable the warnings.
gl_gcc_warnings=no
gl_GCC_VERSION_IFELSE([4], [6],
- [test -d "$srcdir"/.git && gl_gcc_warnings=yes])]
+ [test -f "$srcdir"/.git/refs/tags/v8.22 &&
gl_gcc_warnings=yes])]
)
if test "$gl_gcc_warnings" = yes; then
--
1.9.1
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#17668: [PATCH] build: be more specific about .git directory before enabling warnings |
Date: |
Mon, 02 Jun 2014 18:46:45 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 |
On 06/02/2014 05:31 PM, Eric Blake wrote:
> On 06/02/2014 02:54 AM, Ben Walton wrote:
>> * configure.ac: When looking for a .git checkout, restrict it to git
>> checkouts that contain a coreutils-specific tag.
>>
>> Signed-off-by: Ben Walton <address@hidden>
>> ---
>> configure.ac | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index a7a8bfc..96af9be 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -100,7 +100,7 @@ AC_ARG_ENABLE([gcc-warnings],
>> # we're running from a git repo, then auto enable the warnings.
>> gl_gcc_warnings=no
>> gl_GCC_VERSION_IFELSE([4], [6],
>> - [test -d "$srcdir"/.git && gl_gcc_warnings=yes])]
>> + [test -f "$srcdir"/.git/refs/tags/v8.22 &&
>> gl_gcc_warnings=yes])]
>
> NACK. Git can compress tags to reside in other locations than
> .git/refs/tags (run 'git gc --aggressive' for example). The idea of
> testing for coreutils.git has merit, but you need to come up with a more
> robust test.
Importing the tarball into git for patch management is a
fine and useful thing to do, so we should support that.
We could probably leverage that .tarball-version is only in the tarball.
I'll merge this in and commit in your name:
test -d "$srcdir"/.git \
&& ! test -f .tarball-version \
&& gl_gcc_warnings=yes
thanks,
Pádraig.
--- End Message ---