diff options
author | Wincent Colaiuta <win@wincent.com> | 2008-02-18 09:36:33 +0100 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2008-02-19 20:50:29 -0500 |
commit | 2c2a3782c5092f232e71e8d97272b82cdca0664e (patch) | |
tree | 865b937c9ded5af575903179bcae861833ba7bf0 | |
parent | 20a87ecc5861b0e1b76b99549cfaa965b2b27618 (diff) | |
download | git-2c2a3782c5092f232e71e8d97272b82cdca0664e.tar.gz git-2c2a3782c5092f232e71e8d97272b82cdca0664e.tar.xz |
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>
-rwxr-xr-x | git-gui.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |