Skip to content

Commit b0f7045

Browse files
committed
Merge branch 'py/git-gui-updates'
Git GUI updates. * py/git-gui-updates: git-gui - use mkshortcut on Cygwin git-gui - use cygstart to browse on Cygwin git-gui - remove obsolete Cygwin specific code git gui Makefile - remove Cygwin modifications Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4 Work around Tcl's default `PATH` lookup Move the `_which` function (almost) to the top Move is_<platform> functions to the beginning is_Cygwin: avoid `exec`ing anything windows: ignore empty `PATH` elements git-gui: Fix a typo in README
2 parents 3d0e70a + a793520 commit b0f7045

File tree

5 files changed

+153
-237
lines changed

5 files changed

+153
-237
lines changed

git-gui/Makefile

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,10 @@ GITGUI_SCRIPT := $$0
138138
GITGUI_RELATIVE :=
139139
GITGUI_MACOSXAPP :=
140140

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

git-gui/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ that you first use `git-format-patch` to generate the emails, audit them, and
8888
then send them via `git-send-email`.
8989

9090
A pretty good guide to configuring and using `git-send-email` can be found
91-
[here](https://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/)
91+
[here](https://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/).
9292

9393
### Using your email client
9494

0 commit comments

Comments
 (0)