summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-16 06:39:07 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-16 06:39:07 (GMT)
commit2dfa54c6cb39c443652440f1ee6fdf5a6067364a (patch)
treec49eca8eb045f600a1c098d6d4b48bb2b5cc9597
parentb215883de9322b8b475a04b4768d6ba5455373d1 (diff)
downloadgit-2dfa54c6cb39c443652440f1ee6fdf5a6067364a.zip
git-2dfa54c6cb39c443652440f1ee6fdf5a6067364a.tar.gz
git-2dfa54c6cb39c443652440f1ee6fdf5a6067364a.tar.bz2
git-gui: Skip -dirty suffix on core git versions
If the user is running a 'dirty' version of git (one compiled in a working directory with modified files) we want to just assume it was a committed version, as we really only look at the part that came from a real annotated tag anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 2077261..bdb5571 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -544,6 +544,7 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
error_popup "Cannot parse Git version string:\n\n$_git_version"
exit 1
}
+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