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

Opens diff tool when trying to select files to stage #67

Closed
KaGeN101 opened this issue Oct 27, 2010 · 4 comments
Closed

Opens diff tool when trying to select files to stage #67

KaGeN101 opened this issue Oct 27, 2010 · 4 comments

Comments

@KaGeN101
Copy link

Each time I try and select a file to stage my diff tool opens first and then when I close it the file I am trying to select to stage is selected.
This is really annoying each time I click on a file to highlight it the diff tool first opens

OS: Ubuntu 10.04
cola version 1.4.1.2

@KaGeN101
Copy link
Author

Please note this is only when the external diff tool is setup with a bash script through
diff.external.
Will check if I can get it working with diff..cmd and then update here.

@KaGeN101
Copy link
Author

I can now confirm that when setting up:
git config diftool.[too].cmd as the preferred method to access the diff tool git-cola operates as expected.

@davvid
Copy link
Member

davvid commented Dec 7, 2010

we should probably be calling "git diff --no-ext-diff" to guard ourselves cos it's the combination of your diff.external setting, maybe?

I'm curious about the ~/.gitconfig entries. Can you post the relevent diff and difftool sections? I would not expect difftool.tool.cmd to make a difference.

@davvid
Copy link
Member

davvid commented Dec 7, 2010

gitcmds: Centralize diff options to guard against diff.external

Refactor usage of 'git diff' to pass '--no-ext-diff'.
Avoid launching user-configured diff.external viewers by updating
the _common_diff_opts() function and ensuring that all git.diff
callers use it.

Closed by 121f0ae

Signed-off-by: David Aguilar <davvid@gmail.com>

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants