{"thread":{"id":"44450","subject":"git mergetool indefinite hang on version 2.10+","startedAt":"2016-11-09T22:55:26Z","lastAt":"2016-11-09T23:13:52Z","messageCount":2,"participants":["Mike Dacre","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"305651","messageId":"CAPd9ww_B7gCxvSuuBzH9AbnLsOF1bC_2+mfk0sVfLFF7YHWvNA@mail.gmail.com","threadId":"44450","inReplyTo":null,"subject":"git mergetool indefinite hang on version 2.10+","fromName":"Mike Dacre","fromEmail":"mike.dacre@gmail.com","sentAt":"2016-11-09T22:54:59Z","receivedAt":"2016-11-09T22:55:26Z","isPatch":false,"sender":{"key":"mike.dacre@gmail.com","avatar":null},"body":"Hi all,\n\nI have no idea how to debug this. As of git version 2.10.0 git hangs\nindefinitely when I run `git mergetool`, the result is the same if I\nrun `git mergetool --tool-help`.\n\nThe result is identical regardless of which version of vim I have\ninstalled, or where vim in installed. It is also the same if I remove\nmy .gitconfig file.\n\nI am on Arch Linux, with all of my software updated to the latest\nversions as of this morning. git 2.9.3 and lower works perfectly.\n\nAny ideas?\n\nThanks,\n\nMike\n"},{"id":"305656","messageId":"20161109231346.poarr3i47ltkiae3@sigill.intra.peff.net","threadId":"44450","inReplyTo":"CAPd9ww_B7gCxvSuuBzH9AbnLsOF1bC_2+mfk0sVfLFF7YHWvNA@mail.gmail.com","subject":"Re: git mergetool indefinite hang on version 2.10+","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-11-09T23:13:46Z","receivedAt":"2016-11-09T23:13:52Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Nov 09, 2016 at 02:54:59PM -0800, Mike Dacre wrote:\n\n> I have no idea how to debug this. As of git version 2.10.0 git hangs\n> indefinitely when I run `git mergetool`, the result is the same if I\n> run `git mergetool --tool-help`.\n\nMergetool is a shell script. Try setting GIT_TRACE=1 in the environment\nto see which git programs it's running. Of course it may be\nhanging in a non-git program, too. Try:\n\n  PATH=$(git --exec-path):$PATH\n  sh -x $(which git-mergetool) --tool-help\n\nto get a dump from the shell.\n\n> I am on Arch Linux, with all of my software updated to the latest\n> versions as of this morning. git 2.9.3 and lower works perfectly.\n> \n> Any ideas?\n\nIf it works on v2.9.3 and the bug reproduces, you should be able to use\n\"git bisect\" to find the commit that introduces the problem. There\nweren't a lot of changes to the shell scripts in that time frame, so\njust as a guess, it may be related to d323c6b64 (i18n: git-sh-setup.sh:\nmark strings for translation, 2016-06-17), which was the only\nsignificant change in that time.\n\n-Peff\n"}]}