From: Matthias Andree <matthias.andree@gmx.de>
Date: Wed, 03 Jun 2009 07:32:09 GMT
Subject: Re: [PATCH v3] To make GIT-VERSION-FILE, search for git more widely
Message-ID: <op.uuxtvv1v1e62zd@merlin.emma.line.org>
In-Reply-To: <200906022035.30081.j6t@kdbg.org>

Am 02.06.2009, 20:35 Uhr, schrieb Johannes Sixt <j6t@kdbg.org>:

> On Dienstag, 2. Juni 2009, Junio C Hamano wrote:
>> Nanako Shiraishi <nanako3@lavabit.com> writes:
>> > Junio, I think you forgot to take a follow-up action on this thread  
>> after
>> > sending this message.  The patch favors the git program in the current
>> > directory.
>>
>> Indeed, I did, and I think I am Ok with the patch.  Thanks for a
>> reminder.
>>
>> I thought there was an "simplicity" issue raised by J6t that was not
>> addressed, but after re-reading the thread I do not think it applies
>> (J6t?)
>
> Sorry, I don't recall anymore what I said; but since the thread petered  
> out, I
> use this patch in the repository where I share Matthias' 'sudo make  
> install'
> problem:
>
> Subject: [PATCH] version-gen: Use just built git if no other git is in  
> PATH
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
>
> diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
> index 39cde78..4779313 100755
> --- a/GIT-VERSION-GEN
> +++ b/GIT-VERSION-GEN
> @@ -3,6 +3,9 @@
>  GVF=GIT-VERSION-FILE
>  DEF_VER=v1.6.3.GIT
> +# use git that was just compiled if there is no git elsewhere in PATH
> +PATH=$PATH:.
> +
>  LF='
>  '

Hi Hannes,

that's not what I proposed at the time; I'll look how I ordered  
preferences at the time and will re-submit soon. AFAIR (I'll check the  
archives), Junio had preferred checking $(prefix) before . in order to  
support cross-builds.

Best regards

-- 
Matthias Andree