diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-10 01:09:41 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-10 01:09:41 -0400 |
| commit | b7d68258a34320884735f94f5e7184946b72d065 (patch) | |
| tree | 5311d73afda755744ba1bd290764c814f3179b9d | |
| parent | 1952aa1d5735ccbedd832620e43db3e03fc77088 (diff) | |
| parent | 96f11953c0b0b9b0a0c75fb98bdf239dce5ff582 (diff) | |
| download | git-b7d68258a34320884735f94f5e7184946b72d065.tar.gz git-b7d68258a34320884735f94f5e7184946b72d065.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
| -rwxr-xr-x | git-gui.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 3f5927fb2..ca391136c 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -665,6 +665,7 @@ 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 +regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { catch {wm withdraw .} |