Recent changes to 49: Diffuse fail with git modules because .git is a file and not a directory

#49 Diffuse fail with git modules because .git is a file and not a directory

Gur Stavi — Tue, 16 Feb 2016 13:55:35 -0000

Development version works fine with git submodules.
Thanks,
Gur

#49 Diffuse fail with git modules because .git is a file and not a directory

Derrick Moser — Mon, 15 Feb 2016 16:32:14 -0000

I am not very familiar with Git submodules but I have committed an update to improve handling of them. Please give the development version a spin.

Diffuse fail with git modules because .git is a file and not a directory

Gur Stavi — Mon, 15 Feb 2016 07:53:24 -0000

When using git modules the directory structure is:

Project
.git folder
.gitmodules folder
Module
.git file that refers to .gitmodules folder within the project

When trying to use Diffuse on a file within the git module, Diffuse is looking for a '.git' folder in the function 'findByFolder'. It skips the .git file in the module because it is not a directory and finds the .git folder of the project.
Then git commands fail because git actually 'wants' to use the .git file.
Diffuse should relax the lookup for git and allow .git directory or file.

A quick fix would be to change
if os.path.isdir(name):
into
if os.path.isdir(name) or os.path.isfile(name):

But perhaps a fix that is limited to git or even checks the contents of .git file would be more complete.

Thanks,
Gur