https://sourceforge.net/p/diffuse/feature-requests/49/2016-02-16T13:55:35.477000ZRecent changes to 49: Diffuse fail with git modules because .git is a file and not a directory2016-02-16T13:55:35.477000Z2016-02-16T13:55:35.477000ZGur Stavihttps://sourceforge.net/u/gstavi/https://sourceforge.netcb200f06aa9260249e5b6c902a48994f0397a14c

<div class="markdown_content"><p>Development version works fine with git submodules.<br/> Thanks,<br/> Gur</p></div>

2016-02-15T16:32:14.312000Z2016-02-15T16:32:14.312000ZDerrick Moserhttps://sourceforge.net/u/dtmoser/https://sourceforge.net12680fffcdb926769cbd33f10ad287114e54793d

<div class="markdown_content"><p>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.</p></div>

2016-02-15T07:53:24.766000Z2016-02-15T07:53:24.766000ZGur Stavihttps://sourceforge.net/u/gstavi/https://sourceforge.netdafa23a204d59d8d7296da49b0b01d540b2320ee

<div class="markdown_content"><p>When using git modules the directory structure is:</p> <p>Project<br/> .git folder<br/> .gitmodules folder<br/> Module<br/> .git file that refers to .gitmodules folder within the project</p> <p>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.<br/> Then git commands fail because git actually 'wants' to use the .git file.<br/> Diffuse should relax the lookup for git and allow .git directory or file.</p> <p>A quick fix would be to change <br/> if os.path.isdir(name):<br/> into<br/> if os.path.isdir(name) or os.path.isfile(name):</p> <p>But perhaps a fix that is limited to git or even checks the contents of .git file would be more complete.</p> <p>Thanks,<br/> Gur</p></div>