git-gui: relax "dirty" version detection

wincent · spearce · commit 2c2a3782c509 · 2008-02-19T20:50:29.000-05:00
"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 &lt;win@wincent.com&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ if {![regsub {^git version } $_git_version {} _git_version]} {`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`set _real_git_version $_git_version`
`665`		`-regsub -- {-dirty$} $_git_version {} _git_version`
	`665`	`+regsub -- {[\-\.]dirty$} $_git_version {} _git_version`
`666`	`666`	`regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version`
`667`	`667`	`regsub {\.rc[0-9]+$} $_git_version {} _git_version`
`668`	`668`	`regsub {\.GIT$} $_git_version {} _git_version`