Re: [PATCH 2/2] Make guilt work even after git-sh-setup is moved out of the user's path

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 8, 2008, 00:56 UTC
Message-ID: <7vwsjxxkfd.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080708003256.GB1880@josefsipek.net>

"Josef 'Jeff' Sipek" <jeffpc@josefsipek.net> writes:

Show 23 quoted lines

> On Mon, Jul 07, 2008 at 08:03:12PM -0400, Theodore Ts'o wrote:
>> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
>> ---
>>  guilt |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>> 
>> diff --git a/guilt b/guilt
>> index cdf4e9b..d30d35a 100755
>> --- a/guilt
>> +++ b/guilt
>> @@ -23,7 +23,7 @@ esac
>>  # we change directories ourselves
>>  SUBDIRECTORY_OK=1
>>  
>> -. git-sh-setup
>> +. $(git --exec-path)/git-sh-setup
>
> This seems wrong.
>
> jeffpc@freyr:~$ git --version
> git version 1.5.6.2.247.g923712
> jeffpc@freyr:~$ git --exec-path
> /home/jeffpc/git-bin/bin

Hmm, it is yours that look wrong.

With 1.6.0 preview (aka 'master'):

$ git --version git version 1.5.6.2.255.gbed62 $ git --exec-path /home/junio/git-master/libexec/git-core

With 1.5.6 maintenance track (aka 'maint'):

$ ~/git-maint/bin/git --version git version 1.5.6.2.15.g39f31 $ ~/git-maint/bin/git --exec-path /home/junio/git-maint/bin