From: Wincent Colaiuta <win@wincent.com>
Date: Mon, 18 Feb 2008 08:36:33 +0000 (+0100)
Subject: git-gui: relax "dirty" version detection
X-Git-Tag: v1.5.4.3~1^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2c2a3782c5092f232e71e8d97272b82cdca0664e;p=git.git

git-gui: relax "dirty" version detection

"git gui" would complain at launch if the local version of Git was
"1.5.4.2.dirty". Loosen the regular expression to look for either
"-dirty" or ".dirty", thus eliminating spurious warnings.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index f42e461fd..04bd42576 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -662,7 +662,7 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
 }
 
 set _real_git_version $_git_version
-regsub -- {-dirty$} $_git_version {} _git_version
+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