summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2008-02-18 08:36:33 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-02-20 01:50:29 (GMT)
commit2c2a3782c5092f232e71e8d97272b82cdca0664e (patch)
tree865b937c9ded5af575903179bcae861833ba7bf0 /git-gui.sh
parent20a87ecc5861b0e1b76b99549cfaa965b2b27618 (diff)
downloadgit-2c2a3782c5092f232e71e8d97272b82cdca0664e.zip
git-2c2a3782c5092f232e71e8d97272b82cdca0664e.tar.gz
git-2c2a3782c5092f232e71e8d97272b82cdca0664e.tar.bz2
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>
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index f42e461..04bd425 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