global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-28 10:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-gui: require git >= 2.36

Browse Source 
git-gui since commit d6967022 explicitly requires version >= 1.5.0, and
this coded requirement has never been changed. But, since 0730a5a3a
git-gui actually requires git 2.36, providing 'git hook run.' git-gui
throws an error if that command is not supported.

So, let's update the requirement checking code to 2.36, and throw a more
useful error if this is not met.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
This commit is contained in:
Mark Levedahl
2024-02-12 23:32:44 -05:00
parent 3f07230844
commit 77f648edb6
1 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
git-gui.sh
View File

@@ -992,6 +992,8 @@ if {$_git eq {}} {
##
## version check
set MIN_GIT_VERSION 2.36
if {[catch {set _git_version [git --version]} err]} {
catch {wm withdraw .}
tk_messageBox \
@@ -1002,9 +1004,10 @@ if {[catch {set _git_version [git --version]} err]} {
$err
[appname] requires Git 1.5.0 or later."
[appname] requires Git $MIN_GIT_VERSION or later."
exit 1
}
if {![regsub {^git version } $_git_version {} _git_version]} {
catch {wm withdraw .}
tk_messageBox \
@@ -1029,25 +1032,19 @@ proc get_trimmed_version {s} {
set _real_git_version $_git_version
set _git_version [get_trimmed_version $_git_version]
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
if {[catch {set vcheck [package vcompare $_git_version $MIN_GIT_VERSION]}] ||
[expr $vcheck < 0] } {
set msg1 [mc "Insufficient git version, require: "]
set msg2 [mc "git returned:"]
set message "$msg1 $MIN_GIT_VERSION\n$msg2 $_real_git_version"
catch {wm withdraw .}
if {[tk_messageBox \
-icon warning \
-type yesno \
-default no \
-title "[appname]: warning" \
-message [mc "Git version cannot be determined.
%s claims it is version '%s'.
%s requires at least Git 1.5.0 or later.
Assume '%s' is version 1.5.0?
" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
set _git_version 1.5.0
} else {
exit 1
}
tk_messageBox \
-icon error \
-type ok \
-title [mc "git-gui: fatal error"] \
-message $message
exit 1
}
unset _real_git_version
@@ -1095,20 +1092,6 @@ proc git-version {args} {
}
}
if {[git-version < 1.5]} {
catch {wm withdraw .}
tk_messageBox \
-icon error \
-type ok \
-title [mc "git-gui: fatal error"] \
-message "[appname] requires Git 1.5.0 or later.
You are using [git-version]:
[git --version]"
exit 1
}
######################################################################
##
## configure our library