git-plus icon indicating copy to clipboard operation
git-plus copied to clipboard

[REQUEST] git-plus opens plenty of new windows when external diff tool is configured in .gitconfig

Open fightling opened this issue 7 years ago • 1 comments

I'm running git-plus in atom on an Ubuntu 16.04 machine. And I set up my ~/.gitconfig to use meld for editing diffs:

[merge]
	tool = meld
[diff]
	external = meld_diff
	tool = meld

git-plus seems to be affected by this setting and when I just click a changed file within the staging panel of git-plus it opens plenty Meld instances in external windows. When I try to close one of those new windows it opens again or often it opens like two or more new windows. This is such a strange behavior that I think this can't be what you want git-plus to do in such a situation.

I would prefer to use the internal diff within atom (which is quit nice for displaying diffs) but when I use git outside of atom I still would like to use Meld as a diff viewer or merge editor. So I would like to have an option in the git-plus settings to explicitly set up a diff/merge tool (or at least disable to use the settings of my .gitconfig file).

Currently I've removed meld from my .gitconfig completely which works as intended but now I won't get Meld opening automatically if I do a git diff in the console.

fightling avatar Oct 02 '17 13:10 fightling

additional information: git-plus only seems to use the setting [diff]/external of the .gitconfig. So I still can use "git difftool" or "git mergetool" on console with Meld if I just disable this setting but not "git diff" - which gives me the standard console diff output instead of opening Meld.

fightling avatar Oct 02 '17 13:10 fightling