From: "Shawn O. Pearce" <spearce@spearce.org>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: Julian Phillips <julian@quantumfyre.co.uk>, git@vger.kernel.org
Subject: Re: [PATCH] git-gui: Handle git versions of the form n.n.n.GIT
Date: Tue, 17 Jul 2007 22:54:42 -0400 [thread overview]
Message-ID: <20070718025442.GX32566@spearce.org> (raw)
In-Reply-To: <46a038f90707171932m67c51388jb2304f0b1873e3a6@mail.gmail.com>
Martin Langhoff <martin.langhoff@gmail.com> wrote:
> On 7/17/07, Shawn O. Pearce <spearce@spearce.org> wrote:
> > Applying git-gui: Handle git versions of the form n.n.n.GIT
> >
>
> I'm far from an authority on things TCL, but I don't think this patch
> should be merged as is.
Too late, already applied and pushed. ;-)
> Julian is reporting it as a "fixes my symptom"
> patch, and that's barely what it does.
>
> The regex should be more liberal, imho. With this superficial fix:
I think we are now cleaning up the Git version as best we can:
regsub -- {-dirty$} $_git_version {} _git_version
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
regsub {\.rc[0-9]+$} $_git_version {} _git_version
regsub {\.GIT$} $_git_version {} _git_version
The first fixes the -dirty build problem. The second drops off
the extra information that git-describe throws into the mix when
it generates output for a non-tagged commit. The third kills the
rc* component if this is a release candidate. Note that the rc*
killer must come after the git-describe killer, as the rc* part is
actually in the real tag. The last one fixes the weird case where
the user has somehow bungled his git software distribution so it
cannot generate a git version via git-describe *and* they have no
`version` file in the source code directory. Such people really
should fix their git. But anyway we do support it now.
> - Builds from a repo with a nonstandard (local) tagname tagname have
> a broken git gui
This I cannot do anything about, other than maybe to warn the user
that they are about to run with a version of Git that we cannot
verify and hence we have no idea if git-gui will work correctly,
or fall flat on its face.
I'll add in a confirmation dialog for this case. That way the
user can make the decision. User always knows best.
--
Shawn.
next prev parent reply other threads:[~2007-07-18 2:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-17 11:48 Problem running git-gui Julian Phillips
2007-07-17 12:04 ` Thomas Glanzmann
2007-07-17 21:14 ` [PATCH] git-gui: Handle git versions of the form n.n.n.GIT Julian Phillips
2007-07-17 21:40 ` Brian Downing
2007-07-17 21:45 ` Brian Downing
2007-07-17 21:49 ` Jason Sewall
2007-07-18 1:48 ` Shawn O. Pearce
2007-07-17 22:34 ` Linus Torvalds
2007-07-18 1:52 ` Shawn O. Pearce
2007-07-18 1:51 ` Shawn O. Pearce
2007-07-18 2:32 ` Martin Langhoff
2007-07-18 2:54 ` Shawn O. Pearce [this message]
2007-07-18 10:10 ` Julian Phillips
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070718025442.GX32566@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=julian@quantumfyre.co.uk \
--cc=martin.langhoff@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.