{"thread":{"id":"40916","subject":"[PATCH] git-gui: Remove ancient Cygwin compatibility code","startedAt":"2015-12-01T19:17:43Z","lastAt":"2015-12-11T19:54:09Z","messageCount":2,"participants":["Adam Dinwoodie","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"273864","messageId":"20151201191743.GI14466@dinwoodie.org","threadId":"40916","inReplyTo":null,"subject":"[PATCH] git-gui: Remove ancient Cygwin compatibility code","fromName":"Adam Dinwoodie","fromEmail":"adam@dinwoodie.org","sentAt":"2015-12-01T19:17:43Z","receivedAt":"2015-12-01T19:17:43Z","isPatch":true,"sender":{"key":"adam@dinwoodie.org","avatar":"https://avatars.githubusercontent.com/u/1397507?v=4"},"body":"Remove special path handling for Cygwin in the git-gui Makefile.  This\nused to be necessary, but has been being patched out of the official\nCygwin distribution builds since Git v1.7.9, and should really be\npatched out of the upstream code rather than being patched every time in\nthe Cygwin build process.\n\nSigned-off-by: Adam Dinwoodie <adam@dinwoodie.org>\n---\nI'm the current Cygwin maintainer for Git; this code has been patched\nout of the Cygwin Git builds since v1.7.9,* well before I took over.\nIt's clearly stable and causing no problems, so having it in the\nupstream code rather than patching every time seems The Right Thing To\nDo.\n\n(* The actual patch used in the Cygwin builds just replaces `ifeq\n($(uname_O,Cygwin))` with `ifeq ($(uname_O,noThanks))`, but that's\nclearly the appropriate solution for a quick manual patch, not for the\nactual upstream code.)\n\nSending with apologies to Shawn Pearce for the noise; I'd misread the\nSubmittingPatches doc and sent to him alone first.\n\nI've based this patch off the git-gui tree rather than the main Git tree\nper the SubmittingPatches doc.  Pipe it through `sed\n's!Makekfile!git-gui/\\0!g'` for a version that applies cleanly to the\nmain Git source tree.\n\n Makefile | 21 +++------------------\n 1 file changed, 3 insertions(+), 18 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 4f00bdd..e369046 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -136,25 +136,10 @@\n GITGUI_RELATIVE :=\n GITGUI_MACOSXAPP :=\n \n-ifeq ($(uname_O),Cygwin)\n-\tGITGUI_SCRIPT := `cygpath --windows --absolute \"$(GITGUI_SCRIPT)\"`\n-\n-\t# Is this a Cygwin Tcl/Tk binary?  If so it knows how to do\n-\t# POSIX path translation just like cygpath does and we must\n-\t# keep libdir in POSIX format so Cygwin packages of git-gui\n-\t# work no matter where the user installs them.\n-\t#\n-\tifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))\n-\t\tgg_libdir_sed_in := $(gg_libdir)\n-\telse\n-\t\tgg_libdir_sed_in := $(shell cygpath --windows --absolute \"$(gg_libdir)\")\n-\tendif\n-else\n-\tifeq ($(exedir),$(gg_libdir))\n-\t\tGITGUI_RELATIVE := 1\n-\tendif\n-\tgg_libdir_sed_in := $(gg_libdir)\n-endif\n+ifeq ($(exedir),$(gg_libdir))\n+\tGITGUI_RELATIVE := 1\n+endif\n+gg_libdir_sed_in := $(gg_libdir)\n ifeq ($(uname_S),Darwin)\n \tifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)\n \t\tGITGUI_MACOSXAPP := YesPlease\n-- \n2.5.3\n"},{"id":"274289","messageId":"xmqqmvtgep7i.fsf@gitster.mtv.corp.google.com","threadId":"40916","inReplyTo":"20151201191743.GI14466@dinwoodie.org","subject":"Re: [PATCH] git-gui: Remove ancient Cygwin compatibility code","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-12-11T19:54:09Z","receivedAt":"2015-12-11T19:54:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Adam Dinwoodie <adam@dinwoodie.org> writes:\n\n> Remove special path handling for Cygwin in the git-gui Makefile.  This\n> used to be necessary, but has been being patched out of the official\n> Cygwin distribution builds since Git v1.7.9, and should really be\n> patched out of the upstream code rather than being patched every time in\n> the Cygwin build process.\n>\n> Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>\n> ---\n> I'm the current Cygwin maintainer for Git; this code has been patched\n> out of the Cygwin Git builds since v1.7.9,* well before I took over.\n> It's clearly stable and causing no problems, so having it in the\n> upstream code rather than patching every time seems The Right Thing To\n> Do.\n>\n> (* The actual patch used in the Cygwin builds just replaces `ifeq\n> ($(uname_O,Cygwin))` with `ifeq ($(uname_O,noThanks))`, but that's\n> clearly the appropriate solution for a quick manual patch, not for the\n> actual upstream code.)\n>\n> Sending with apologies to Shawn Pearce for the noise; I'd misread the\n> SubmittingPatches doc and sent to him alone first.\n>\n> I've based this patch off the git-gui tree rather than the main Git tree\n> per the SubmittingPatches doc.  Pipe it through `sed\n> 's!Makekfile!git-gui/\\0!g'` for a version that applies cleanly to the\n> main Git source tree.\n\nPat, this looks like a good thing to have.\n\nMore generally, should I expect a pull request from you sometime in\na week or two for updates in the git-gui part?\n\nThanks.\n\n>  Makefile | 21 +++------------------\n>  1 file changed, 3 insertions(+), 18 deletions(-)\n>\n> diff --git a/Makefile b/Makefile\n> index 4f00bdd..e369046 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -136,25 +136,10 @@\n>  GITGUI_RELATIVE :=\n>  GITGUI_MACOSXAPP :=\n>  \n> -ifeq ($(uname_O),Cygwin)\n> -\tGITGUI_SCRIPT := `cygpath --windows --absolute \"$(GITGUI_SCRIPT)\"`\n> -\n> -\t# Is this a Cygwin Tcl/Tk binary?  If so it knows how to do\n> -\t# POSIX path translation just like cygpath does and we must\n> -\t# keep libdir in POSIX format so Cygwin packages of git-gui\n> -\t# work no matter where the user installs them.\n> -\t#\n> -\tifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))\n> -\t\tgg_libdir_sed_in := $(gg_libdir)\n> -\telse\n> -\t\tgg_libdir_sed_in := $(shell cygpath --windows --absolute \"$(gg_libdir)\")\n> -\tendif\n> -else\n> -\tifeq ($(exedir),$(gg_libdir))\n> -\t\tGITGUI_RELATIVE := 1\n> -\tendif\n> -\tgg_libdir_sed_in := $(gg_libdir)\n> -endif\n> +ifeq ($(exedir),$(gg_libdir))\n> +\tGITGUI_RELATIVE := 1\n> +endif\n> +gg_libdir_sed_in := $(gg_libdir)\n>  ifeq ($(uname_S),Darwin)\n>  \tifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)\n>  \t\tGITGUI_MACOSXAPP := YesPlease\n"}]}