New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

uninitialized diff.tool error message not shown graphically #457

Closed
Vdragon opened this Issue May 20, 2015 · 1 comment

Comments

Projects
None yet
2 participants
@Vdragon
Contributor

Vdragon commented May 20, 2015

The diff operation will only print following message to stderr and nothing else.

This message is displayed because 'diff.tool' is not configured.
See 'git difftool --tool-help' or 'git help config' for more details.
'git difftool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld kompare gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 codecompare emerge vimdiff
No known diff tool is available.
external diff died, stopping at po/zh_TW.po.

@Vdragon Vdragon added the bug label May 20, 2015

@davvid

This comment has been minimized.

Member

davvid commented Jul 17, 2015

This is probably because we don't launch git-difftool and block on it, we fork it off in the background.

I wonder if we can improve what that does. We could instead have a thread launch it, and it could be in charge of capturing stdout+stderr. When difftool finishes, it can post the message back to the main thread, where it can be displayed to the user. Good catch!

The core.fork() function has always bothered me, especially the windows version. Doing it this way might actually allow us to improve it. The thing that the fork() function doesn't seem to get right is launching gitk..

I was thinking I might be able to simplify it by rewriting each command as sh -c "...." on win32, which will then get things like gitk working correctly since it'll be launched by bash, which understands the #!/bin/sh shebangs.

I'd especially like to get this one fixed before the next relese.

davvid added a commit to davvid/git-cola that referenced this issue Mar 28, 2018

app: refactor initialization to pass the context to the view
Related-to: git-cola#457
Signed-off-by: David Aguilar <davvid@gmail.com>

davvid added a commit to davvid/git-cola that referenced this issue Mar 28, 2018

widgets: implement async_command()
Related-to: git-cola#457
Signed-off-by: David Aguilar <davvid@gmail.com>

davvid added a commit to davvid/git-cola that referenced this issue Mar 28, 2018

app: refactor widgets to provide a context to difftool commands
Related-to: git-cola#457
Signed-off-by: David Aguilar <davvid@gmail.com>

@davvid davvid closed this in 7773477 Mar 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment