git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-29 04:28:53 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'gitk-and-git-gui-patches'

Browse Source 
These are Git for Windows' Git GUI and gitk patches. We will have to
decide at some point what to do about them, but that's a little lower
priority (as Git GUI seems to be unmaintained for the time being, and
the gitk maintainer keeps a very low profile on the Git mailing list,
too).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-10-11 13:38:58 +02:00
committed by Lessley Dennington
parent 6cc29063fb 1998ce5d61
commit 6b4da1f0c0
4 changed files with 121 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-gui/git-gui.sh
View File

@@ -623,7 +623,11 @@ proc git_write {args} {
}
proc githook_read {hook_name args} {
set pchook [gitdir hooks $hook_name]
if {[package vcompare $::_git_version 2.5.0] >= 0} {
set pchook [git rev-parse --git-path "hooks/$hook_name"]
} else {
set pchook [gitdir hooks $hook_name]
}
lappend args 2>@1
# On Windows [file executable] might lie so we need to ask
@@ -1230,6 +1234,12 @@ set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
if {![info exists env(SSH_ASKPASS)]} {
set env(SSH_ASKPASS) [gitexec git-gui--askpass]
}
if {![info exists env(GIT_ASKPASS)]} {
set env(GIT_ASKPASS) [gitexec git-gui--askpass]
}
if {![info exists env(GIT_ASK_YESNO)]} {
set env(GIT_ASK_YESNO) [gitexec git-gui--askyesno]
}
######################################################################
##