git-gui: Support more git version notations.
Recently the msysgit repository has got a '1.6.1-msysgit1' tag, which, when used to build the git version, is not handled gracefully by the git-gui version code. This patch changes the regular expressions to fix it, and removes the hardcoded 'rc' string. Now git-gui can accept a version tail like '.foo123.GIT.bar.456.7.g89ab' Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov committed
Feb 7, 2009 at 19:43 UTC
764369c5ea730894c75f32c2f94a651dd517fc5b
1 file changed
+2
-2
git-gui.sh
+2
-2
@@ -769,9 +769,9 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
769
set _real_git_version $_git_version
770
regsub -- {[\-\.]dirty$} $_git_version {} _git_version
771
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
772
-regsub {\.rc[0-9]+$} $_git_version {} _git_version
772
+regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
773
regsub {\.GIT$} $_git_version {} _git_version
774
-regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
774
+regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
775
776
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
777
catch {wm withdraw .}