git-gui problem with version number.

git-gui problem with version number.

[David Kastrup]

Hi, git-gui does not get along with the creativeness in git
versioning:

git-gui
Error in startup script: expected version number but got "1.5.3.rc2.4.g726f9-dirty"
    while executing
"package vcompare $_git_version $vr"
    ("2" arm line 4)
    invoked from within
"switch [llength $args] {
        0 {
                return $_git_version
        }

        2 {
                set op [lindex $args 0]
                set vr [lindex $args 1]
                set cm [package vcompare $_git_ver..."
    (procedure "git-version" line 4)
    invoked from within
"git-version < 1.5"
    (file "/usr/local/bin/git-gui" line 1)


-- 
David Kastrup

Re: git-gui problem with version number.

[Shawn O. Pearce]

David Kastrup <dak@gnu.org> wrote:
> Hi, git-gui does not get along with the creativeness in git
> versioning:

What version of git-gui?  gitgui-0.7.5-67-g91464df and later have
fixes to handle all of the fun cases in git versioning.  Like the
one you have here.
 
> git-gui
> Error in startup script: expected version number but got "1.5.3.rc2.4.g726f9-dirty"
>     while executing
> "package vcompare $_git_version $vr"

-- 
Shawn.

Re: git-gui problem with version number.

[David Kastrup]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> David Kastrup <dak@gnu.org> wrote:
>> Hi, git-gui does not get along with the creativeness in git
>> versioning:
>
> What version of git-gui?  gitgui-0.7.5-67-g91464df and later have
> fixes to handle all of the fun cases in git versioning.  Like the
> one you have here.
>  
>> git-gui
>> Error in startup script: expected version number but got "1.5.3.rc2.4.g726f9-dirty"
>>     while executing
>> "package vcompare $_git_version $vr"

The one coming with the mentioned version number.  I suspect that this
may be a matter of the Perl libraries being used: I experience this on
an Ubuntu Dapper, but not on other (newer) systems compiled from the
same source.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: git-gui problem with version number.

[Shawn O. Pearce]

David Kastrup <dak@gnu.org> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
> 
> > David Kastrup <dak@gnu.org> wrote:
> >> Hi, git-gui does not get along with the creativeness in git
> >> versioning:
> >
> > What version of git-gui?  gitgui-0.7.5-67-g91464df and later have
> > fixes to handle all of the fun cases in git versioning.  Like the
> > one you have here.
> >  
> >> git-gui
> >> Error in startup script: expected version number but got "1.5.3.rc2.4.g726f9-dirty"
> >>     while executing
> >> "package vcompare $_git_version $vr"
> 
> The one coming with the mentioned version number.  I suspect that this
> may be a matter of the Perl libraries being used: I experience this on
> an Ubuntu Dapper, but not on other (newer) systems compiled from the
> same source.

Ah.  Junio hasn't pulled those version numbering fixes from me yet.
Because I haven't asked him to pull in a while.  That explains that.

There's no Perl involved in git-gui, except for the Perl in an
underlying Git command it might invoke.  So perhaps you were
talking about Tcl above?

Anyway, you can setup a build with the most recent 'stable
development' version of git-gui:

  git checkout -b with-new-gitgui
  git pull -s subtree git://repo.or.cz/git-gui.git

That's really all Junio does.  Although I think he does actually try
to test it briefly before pushing a final release out to the public.
Just to make sure Git hasn't broken anything really obvious in
git-gui.  ;-)

-- 
Shawn.

Re: git-gui problem with version number.

[David Kastrup]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> David Kastrup <dak@gnu.org> wrote:
>> 
>> The one coming with the mentioned version number.  I suspect that
>> this may be a matter of the Perl libraries being used: I experience
>> this on an Ubuntu Dapper, but not on other (newer) systems compiled
>> from the same source.
>
> Ah.  Junio hasn't pulled those version numbering fixes from me yet.
> Because I haven't asked him to pull in a while.  That explains that.
>
> There's no Perl involved in git-gui, except for the Perl in an
> underlying Git command it might invoke.  So perhaps you were talking
> about Tcl above?

Uh, whatever this backtrace was in...  I did not look too closely.

> Anyway, you can setup a build with the most recent 'stable
> development' version of git-gui:
>
>   git checkout -b with-new-gitgui
>   git pull -s subtree git://repo.or.cz/git-gui.git

Ok.  Would the necessity for this depend on the Tcl version?

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: git-gui problem with version number.

[Shawn O. Pearce]

David Kastrup <dak@gnu.org> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
> > Anyway, you can setup a build with the most recent 'stable
> > development' version of git-gui:
> >
> >   git checkout -b with-new-gitgui
> >   git pull -s subtree git://repo.or.cz/git-gui.git
> 
> Ok.  Would the necessity for this depend on the Tcl version?

I thought all versions of Tcl did not understand the 'creative'
git version strings.  So I'm surprised to hear it works on one
system but not on another, even though you have the same version
of git and git-gui.

-- 
Shawn.

Re: git-gui problem with version number.

[David Kastrup]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> David Kastrup <dak@gnu.org> wrote:
>> "Shawn O. Pearce" <spearce@spearce.org> writes:
>> > Anyway, you can setup a build with the most recent 'stable
>> > development' version of git-gui:
>> >
>> >   git checkout -b with-new-gitgui
>> >   git pull -s subtree git://repo.or.cz/git-gui.git
>> 
>> Ok.  Would the necessity for this depend on the Tcl version?
>
> I thought all versions of Tcl did not understand the 'creative'
> git version strings.  So I'm surprised to hear it works on one
> system but not on another, even though you have the same version
> of git and git-gui.

I'll check once I am at work, but I am pretty sure that the versions
are pretty much in synch.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: git-gui problem with version number.

[David Kastrup]

David Kastrup <dak@gnu.org> writes:

> "Shawn O. Pearce" <spearce@spearce.org> writes:
>
>> David Kastrup <dak@gnu.org> wrote:
>>> "Shawn O. Pearce" <spearce@spearce.org> writes:
>>> > Anyway, you can setup a build with the most recent 'stable
>>> > development' version of git-gui:
>>> >
>>> >   git checkout -b with-new-gitgui
>>> >   git pull -s subtree git://repo.or.cz/git-gui.git
>>> 
>>> Ok.  Would the necessity for this depend on the Tcl version?
>>
>> I thought all versions of Tcl did not understand the 'creative'
>> git version strings.  So I'm surprised to hear it works on one
>> system but not on another, even though you have the same version
>> of git and git-gui.
>
> I'll check once I am at work, but I am pretty sure that the versions
> are pretty much in synch.

Now that is funny.  I am pretty sure (or rather _have_ been pretty
sure) that I cloned the respective repositories with the same command.
Yet now both are up-to-date according to git-pull (and have identical
.config contents), and the first compiles version git version
1.5.3.rc2.41.gb47b1 while the second compiles version
1.5.3.rc3.7.gd58e-dirty.  Both have been cloned from git.git, the
second with

* master
  origin/HEAD
  origin/html
  origin/maint
  origin/man
  origin/master
  origin/next
  origin/pu
  origin/todo

and the first with
* master
  origin/HEAD
  origin/html
  origin/maint
  origin/man
  origin/master
  origin/next
  origin/pu
  origin/todo

On the one with the problematic version, I get
git-rev-list -2 origin/HEAD |git-name-rev --stdin
d58e8d34b019d435b424811c6f972910dfac6f55 (master)
1a44be9a0ff6fa623ff6061992f5ad1831dc7cab (master~1)

and on the other one I get
git-rev-list -2 origin/HEAD |git-name-rev --stdin
d58e8d34b019d435b424811c6f972910dfac6f55 (remotes/origin/HEAD)
1a44be9a0ff6fa623ff6061992f5ad1831dc7cab (remotes/origin/HEAD~1)

git-rev-list -2 master |git-name-rev --stdin
0d59d6cfd3ed2510a8e7d8c9fbc54c21133bc3a6 (master)
d58e8d34b019d435b424811c6f972910dfac6f55 (remotes/origin/HEAD)

So let me guess: the "dirty" in the version number comes about when
one has changes that are not in the upstream version, and it is this
string which confuses git-gui?

But then the version numbers are _so_ different.  I probably am
overlooking something.

-- 
David Kastrup

Re: git-gui problem with version number.

[David Kastrup]

David Kastrup <dak@gnu.org> writes:

> Now that is funny.  I am pretty sure (or rather _have_ been pretty
> sure) that I cloned the respective repositories with the same command.
> Yet now both are up-to-date according to git-pull (and have identical
> .config contents), and the first compiles version git version
> 1.5.3.rc2.41.gb47b1 while the second compiles version
> 1.5.3.rc3.7.gd58e-dirty.  Both have been cloned from git.git, the

A combination of rebasing and pushing made the difference go away and
made git-gui work again.  Nevertheless, it would be a good idea not to
balk at the dirty version strings.

-- 
David Kastrup

Re: git-gui problem with version number.

[Shawn O. Pearce]

David Kastrup <dak@gnu.org> wrote:
> David Kastrup <dak@gnu.org> writes:
> 
> > Now that is funny.  I am pretty sure (or rather _have_ been pretty
> > sure) that I cloned the respective repositories with the same command.
> > Yet now both are up-to-date according to git-pull (and have identical
> > .config contents), and the first compiles version git version
> > 1.5.3.rc2.41.gb47b1 while the second compiles version
> > 1.5.3.rc3.7.gd58e-dirty.  Both have been cloned from git.git, the
> 
> A combination of rebasing and pushing made the difference go away and
> made git-gui work again.  Nevertheless, it would be a good idea not to
> balk at the dirty version strings.

Did you not see me already state in this thread that its already
been fixed?  Latest git-gui already has the problem dealt with,
and that latest version will be included in git 1.5.3 when it ships.

Nevertheless, thanks for the problem report.

-- 
Shawn.

Re: git-gui problem with version number.

[David Kastrup]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> David Kastrup <dak@gnu.org> wrote:
>> David Kastrup <dak@gnu.org> writes:
>> 
>> > Now that is funny.  I am pretty sure (or rather _have_ been pretty
>> > sure) that I cloned the respective repositories with the same command.
>> > Yet now both are up-to-date according to git-pull (and have identical
>> > .config contents), and the first compiles version git version
>> > 1.5.3.rc2.41.gb47b1 while the second compiles version
>> > 1.5.3.rc3.7.gd58e-dirty.  Both have been cloned from git.git, the
>> 
>> A combination of rebasing and pushing made the difference go away and
>> made git-gui work again.  Nevertheless, it would be a good idea not to
>> balk at the dirty version strings.
>
> Did you not see me already state in this thread that its already
> been fixed?

I saw you state that the problem was fixed in your local version, but
that this had not been pulled into git.git.  So I was adding a vote to
have this included.

> Latest git-gui already has the problem dealt with, and that latest
> version will be included in git 1.5.3 when it ships.

That is good to hear but it was far from obvious when I wrote the
above mail.

> Nevertheless, thanks for the problem report.

You are welcome.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum