Skip to content

Commit 346bfbe

Browse files
committed
git-gui: Remove unused Cygwin compatibility code
Cygwin-distributed builds of git-gui have patched out the Cygwin-specific compatibility code in the makefile before compiling since at least the start of 2012 (specifically since at least Git v1.7.9). The compatibility code is clearly not necessary, so remove it from the official git-gui code as well. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>
1 parent 82b2cab commit 346bfbe

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

Makefile

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,11 @@ GITGUI_SCRIPT := $$0
136136
GITGUI_RELATIVE :=
137137
GITGUI_MACOSXAPP :=
138138

139-
ifeq ($(uname_O),Cygwin)
140-
GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
141-
142-
# Is this a Cygwin Tcl/Tk binary? If so it knows how to do
143-
# POSIX path translation just like cygpath does and we must
144-
# keep libdir in POSIX format so Cygwin packages of git-gui
145-
# work no matter where the user installs them.
146-
#
147-
ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))
148-
gg_libdir_sed_in := $(gg_libdir)
149-
else
150-
gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
151-
endif
152-
else
153-
ifeq ($(exedir),$(gg_libdir))
154-
GITGUI_RELATIVE := 1
155-
endif
156-
gg_libdir_sed_in := $(gg_libdir)
139+
ifeq ($(exedir),$(gg_libdir))
140+
GITGUI_RELATIVE := 1
157141
endif
142+
gg_libdir_sed_in := $(gg_libdir)
143+
158144
ifeq ($(uname_S),Darwin)
159145
ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
160146
GITGUI_MACOSXAPP := YesPlease

0 commit comments

Comments
 (0)