Skip to content
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

Warn on directory compare when there is no diff tool configured #57

Closed
aminpaks opened this issue Mar 30, 2017 · 10 comments
Closed

Warn on directory compare when there is no diff tool configured #57

aminpaks opened this issue Mar 30, 2017 · 10 comments
Assignees
Labels
bug Something isn't working

Comments

@aminpaks
Copy link

aminpaks commented Mar 30, 2017

I never could get this to work!
I follow these steps:

  • >GitLens: Directory Compare
  • Pick one remote branch
  • Enter

Nothing happens!

Any help?

@eamodio
Copy link
Member

eamodio commented Mar 30, 2017

@aminpaks you'll need to have git configured with a difftool. Do you have that setup?

@aminpaks
Copy link
Author

aminpaks commented Mar 30, 2017

No I thought it's part of vscode!
How to do that?
Would it possible at least interact with user if it's not setup yet?

@eamodio
Copy link
Member

eamodio commented Mar 30, 2017

Vscode can't (as far as I know) do directory compares. Would need another difftool like Beyond Compare.
I will look into either hiding or providing some feedback on those options if it isn't setup

@aminpaks
Copy link
Author

aminpaks commented Mar 30, 2017

Thanks in advance.
But if vscode team can provide this ability that would be so good!

@eamodio
Copy link
Member

eamodio commented Mar 30, 2017

@aminpaks FYI microsoft/vscode#6898

@eamodio eamodio added the bug Something isn't working label Apr 1, 2017
@eamodio eamodio self-assigned this Apr 1, 2017
@eamodio eamodio changed the title Compare Directory Warn on directory compare when there is no diff tool configured Apr 1, 2017
@eamodio eamodio closed this as completed Apr 1, 2017
@Dominik-K
Copy link

Hi @eamodio,

an error message window pops up with no text shown, if the diff.tool is not set (via git config --global --unset diff.tool). Using the current version 1.11.0 (1.11.0).

I just started using your fantastic tool. It's very nice. Thanks for that.

@eamodio eamodio reopened this Apr 7, 2017
@eamodio eamodio closed this as completed in 6a3428e Apr 7, 2017
@eamodio
Copy link
Member

eamodio commented Apr 7, 2017

@Dominik-K thanks for the report -- this is fixed in v3.2.1

@pluma
Copy link

pluma commented Nov 9, 2017

Would it be possible to change this so diff.guitool is used instead (and that git diff is executed using the --gui flag)? I would like to use a GUI tool when running a diff from within VSCode but keep using the default when diffing in the shell.

@eamodio
Copy link
Member

eamodio commented Nov 9, 2017

@pluma Sounds like a good change -- would you mind opening a new issue to track this?

billsedison added a commit to noside911/vscode-gitlens that referenced this issue Jan 4, 2019
@github-actions
Copy link

github-actions bot commented Dec 7, 2020

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

4 participants