2ccaf50d3e
Removes git-1.9.0-manifest-msys2.patch as it is already applied upstream as fe90397604f9f9695b3fa0b8b11d9f93533b655f Signed-off-by: Christopher Degawa <ccom@randomderp.com>
26 lines
696 B
Diff
26 lines
696 B
Diff
--- a/git-gui/git-gui.sh
|
|
+++ b/git-gui/git-gui.sh
|
|
@@ -51,7 +51,10 @@ catch {rename send {}} ; # What an evil concept...
|
|
if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
|
|
set oguilib $::env(GIT_GUI_LIB_DIR)
|
|
} else {
|
|
- set oguilib {@@GITGUI_LIBDIR@@}
|
|
+ set oguilib [exec cygpath \
|
|
+ --windows \
|
|
+ --absolute \
|
|
+ {@@GITGUI_LIBDIR@@}]
|
|
}
|
|
set oguirel {@@GITGUI_RELATIVE@@}
|
|
if {$oguirel eq {1}} {
|
|
@@ -274,10 +277,6 @@ proc is_Cygwin {} {
|
|
set _iscygwin 0
|
|
} else {
|
|
set _iscygwin 1
|
|
- # Handle MSys2 which is only cygwin when MSYSTEM is MSYS.
|
|
- if {[info exists ::env(MSYSTEM)] && $::env(MSYSTEM) ne "MSYS"} {
|
|
- set _iscygwin 0
|
|
- }
|
|
}
|
|
} else {
|
|
set _iscygwin 0
|