[PATCH] gitk: Handle msysGit version during version comparisons

[PATCH] gitk: Handle msysGit version during version comparisons

[Pat Thoyts]

  msysGit generates version strings with text appended which cannot
  be used with vcompare. Limit git_version to the first three digits
  which are the real git version.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 gitk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gitk b/gitk
index 0804e6e..1855390 100755
--- a/gitk
+++ b/gitk
@@ -11152,7 +11152,7 @@ set nullid2 "0000000000000000000000000000000000000001"
 set nullfile "/dev/null"
 
 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
-set git_version [lindex [exec git version] end]
+set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .]
 
 set runq {}
 set history {}
-- 
1.6.3.msysgit.0

Re: [PATCH] gitk: Handle msysGit version during version comparisons

[Paul Mackerras]

Pat Thoyts writes:

>   msysGit generates version strings with text appended which cannot
>   be used with vcompare. Limit git_version to the first three digits
>   which are the real git version.

Thanks, applied.

Paul.

Re: [PATCH] gitk: Handle msysGit version during version comparisons

[Johannes Schindelin]

Hi,

On Mon, 18 May 2009, Pat Thoyts wrote:

> 
>   msysGit generates version strings with text appended which cannot
>   be used with vcompare. Limit git_version to the first three digits
>   which are the real git version.
> 
> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

Is that indent intentional?

Ciao,
Dscho

Re: [PATCH] gitk: Handle msysGit version during version comparisons

[Michael J Gruber]

Johannes Schindelin venit, vidit, dixit 19.05.2009 10:43:
> Hi,
> 
> On Mon, 18 May 2009, Pat Thoyts wrote:
> 
>>
>>   msysGit generates version strings with text appended which cannot
>>   be used with vcompare. Limit git_version to the first three digits
>>   which are the real git version.
>>
>> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
> 
> Is that indent intentional?
> 
> Ciao,
> Dscho

It is clearly indentional :)

[During my git beginnings, the standard output format of git log made me
believe I should format commit message bodies like that, too.]

Michael

Re: [PATCH] gitk: Handle msysGit version during version comparisons

[Pat Thoyts]

Michael J Gruber <git@drmicha.warpmail.net> writes:

>Johannes Schindelin venit, vidit, dixit 19.05.2009 10:43:
>> Hi,
>> 
>> On Mon, 18 May 2009, Pat Thoyts wrote:
>> 
>>>
>>>   msysGit generates version strings with text appended which cannot
>>>   be used with vcompare. Limit git_version to the first three digits
>>>   which are the real git version.
>>>
>>> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
>> 
>> Is that indent intentional?
>> 
>> Ciao,
>> Dscho
>
>It is clearly indentional :)
>
>[During my git beginnings, the standard output format of git log made me
>believe I should format commit message bodies like that, too.]

It was intentional and the above followup is why. Evidently I should
not do so in the future.

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD