{"thread":{"id":"46205","subject":"[PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X","startedAt":"2017-06-19T02:10:42Z","lastAt":"2017-06-19T03:02:53Z","messageCount":2,"participants":["David Aguilar","Samuel Lijin"],"isPatch":true,"patchVersion":3,"patchTotal":null},"messages":[{"id":"322537","messageId":"20170619021033.22968-1-davvid@gmail.com","threadId":"46205","inReplyTo":null,"subject":"[PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2017-06-19T02:10:33Z","receivedAt":"2017-06-19T02:10:42Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"The macOS X fork of Meld[1] requires a \"=\" in the \"--output\"\nargument, as it uses a wrapper[2] script that munges the\n\"--output\" argument before calling into the common \"meld\"\nscript.\n\nThe macOS X wrapper script[2] accepts \"--output=<filename>\"\nonly, despite the fact that the underlying meld code accepts\nboth \"--output <filename\" and \"--output=<filename>\"[3].\n\nAll versions of meld which accept \"--output\" accept it in\nthe \"--output=<filename>\" form, so use \"--output=<file>\" for\nmaximum compatibility.\n\n[1] https://github.com/yousseb/meld\n[2] https://github.com/yousseb/meld/blob/master/osx/Meld\n[3] https://github.com/yousseb/meld/issues/42\n\nReported-by: Matthew Groth <mgroth49@gmail.com>\nHelped-by: Samuel Lijin <sxlijin@gmail.com>\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\nI cloned the meld repo and could not find the code reported in the original\nissue, but I did find that same exact code existed in a macOS fork.\n\nAfter more investigation, this turned out to be a macOS-only issue.  The\ncommit message has been updated to better reflect what's really going on.\n\n mergetools/meld | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/mergetools/meld b/mergetools/meld\nindex bc178e8882..7a08470f88 100644\n--- a/mergetools/meld\n+++ b/mergetools/meld\n@@ -10,7 +10,7 @@ merge_cmd () {\n \n \tif test \"$meld_has_output_option\" = true\n \tthen\n-\t\t\"$merge_tool_path\" --output \"$MERGED\" \\\n+\t\t\"$merge_tool_path\" --output=\"$MERGED\" \\\n \t\t\t\"$LOCAL\" \"$BASE\" \"$REMOTE\"\n \telse\n \t\t\"$merge_tool_path\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n-- \n2.13.1.453.gc0395165f3\n\n"},{"id":"322541","messageId":"CAJZjrdV5k2nUm3SRrA-AqQ=fJBm1CeLc1VLmGkWL1Wh+p9MNDg@mail.gmail.com","threadId":"46205","inReplyTo":"20170619021033.22968-1-davvid@gmail.com","subject":"Re: [PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X","fromName":"Samuel Lijin","fromEmail":"sxlijin@gmail.com","sentAt":"2017-06-19T03:02:07Z","receivedAt":"2017-06-19T03:02:53Z","isPatch":true,"sender":{"key":"sxlijin@gmail.com","avatar":"https://gravatar.com/avatar/01777bf1eae64e2b4dca97dcac182a6abbcf6fd8cb4d5b8fa33edf9f8cc21746?d=mp&s=160"},"body":"On Sun, Jun 18, 2017 at 10:10 PM, David Aguilar <davvid@gmail.com> wrote:\n> The macOS X fork of Meld[1] requires a \"=\" in the \"--output\"\n> argument, as it uses a wrapper[2] script that munges the\n> \"--output\" argument before calling into the common \"meld\"\n> script.\n>\n> The macOS X wrapper script[2] accepts \"--output=<filename>\"\n> only, despite the fact that the underlying meld code accepts\n> both \"--output <filename\" and \"--output=<filename>\"[3].\n>\n> All versions of meld which accept \"--output\" accept it in\n> the \"--output=<filename>\" form, so use \"--output=<file>\" for\n> maximum compatibility.\n\nAha, then if that's the case this looks fine to me. Thanks!\n\n> [1] https://github.com/yousseb/meld\n> [2] https://github.com/yousseb/meld/blob/master/osx/Meld\n> [3] https://github.com/yousseb/meld/issues/42\n>\n> Reported-by: Matthew Groth <mgroth49@gmail.com>\n> Helped-by: Samuel Lijin <sxlijin@gmail.com>\n> Signed-off-by: David Aguilar <davvid@gmail.com>\n> ---\n> I cloned the meld repo and could not find the code reported in the original\n> issue, but I did find that same exact code existed in a macOS fork.\n>\n> After more investigation, this turned out to be a macOS-only issue.  The\n> commit message has been updated to better reflect what's really going on.\n>\n>  mergetools/meld | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/mergetools/meld b/mergetools/meld\n> index bc178e8882..7a08470f88 100644\n> --- a/mergetools/meld\n> +++ b/mergetools/meld\n> @@ -10,7 +10,7 @@ merge_cmd () {\n>\n>         if test \"$meld_has_output_option\" = true\n>         then\n> -               \"$merge_tool_path\" --output \"$MERGED\" \\\n> +               \"$merge_tool_path\" --output=\"$MERGED\" \\\n>                         \"$LOCAL\" \"$BASE\" \"$REMOTE\"\n>         else\n>                 \"$merge_tool_path\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n> --\n> 2.13.1.453.gc0395165f3\n>\n"}]}