{"thread":{"id":"40671","subject":"git-gui is still using old-style git-merge invocation","startedAt":"2015-10-29T17:50:16Z","lastAt":"2015-10-29T19:31:19Z","messageCount":3,"participants":["Johannes Sixt","Dennis Kaarsemaker"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"272489","messageId":"56325C58.1060007@kdbg.org","threadId":"40671","inReplyTo":null,"subject":"git-gui is still using old-style git-merge invocation","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2015-10-29T17:50:16Z","receivedAt":"2015-10-29T17:50:16Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Performing a merge with git gui presents the following message in the \nmerge result window:\n\nwarning: old-style 'git merge <msg> HEAD <commit>' is deprecated.\nMerge made by the 'recursive' strategy.\n  a | 1 +\n  1 file changed, 1 insertion(+)\n  create mode 100644 a\n\nBut I am unable to find where the invocation happens. Can somebody help?\n\n-- Hannes\n\nPS: Reproducer:\n\ngit init\necho a > a\ngit add a\ngit commit -ma a\ngit checkout -b side @~\necho b > b\ngit add b\ngit commit -mb\ngit gui      # to merge: Ctrl-M, Enter, Enter\n"},{"id":"272490","messageId":"1446141395.3199.2.camel@kaarsemaker.net","threadId":"40671","inReplyTo":"56325C58.1060007@kdbg.org","subject":"Re: git-gui is still using old-style git-merge invocation","fromName":"Dennis Kaarsemaker","fromEmail":"dennis@kaarsemaker.net","sentAt":"2015-10-29T17:56:35Z","receivedAt":"2015-10-29T17:56:35Z","isPatch":false,"sender":{"key":"dennis@kaarsemaker.net","avatar":"https://avatars.githubusercontent.com/u/200649?v=4"},"body":"On do, 2015-10-29 at 18:50 +0100, Johannes Sixt wrote:\n> Performing a merge with git gui presents the following message in the\n> merge result window:\n> \n> warning: old-style 'git merge <msg> HEAD <commit>' is deprecated.\n> Merge made by the 'recursive' strategy.\n>   a | 1 +\n>   1 file changed, 1 insertion(+)\n>   create mode 100644 a\n> \n> But I am unable to find where the invocation happens. Can somebody\n> help?\n\ngit-gui/lib/merge.tcl, method _start\n\nThe command is constructed on lines 115-120 (master as of today,\n 37023ba3)\n-- \nDennis Kaarsemaker\nwww.kaarsemaker.net\n"},{"id":"272495","messageId":"56327407.2050607@kdbg.org","threadId":"40671","inReplyTo":"1446141395.3199.2.camel@kaarsemaker.net","subject":"Re: git-gui is still using old-style git-merge invocation","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2015-10-29T19:31:19Z","receivedAt":"2015-10-29T19:31:19Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Thanks!\n"}]}