motiejus
/
jgit
1
Fork 0
Code Releases Activity

JGit CLI should check if calling itself when invoking native git exe 

Bug: 480782
Change-Id: I0d7f7a648671e7ff678f2b19fe39b85f8835c061
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
This commit is contained in:
Kaloyan Raev 2015-10-27 16:14:54 +02:00 committed by Christian Halstrick
parent 3afdaf0b3d
commit 8a53d7e2fd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
View File

@ -556,6 +556,14 @@ protected File discoverGitSystemConfig() {
return null;
}
// Bug 480782: Check if the discovered git executable is JGit CLI
String v = readPipe(gitExe.getParentFile(),
new String[] { "git", "--version" }, //$NON-NLS-1$ //$NON-NLS-2$
Charset.defaultCharset().name());
if (v.startsWith("jgit")) { //$NON-NLS-1$
return null;
}
// Trick Git into printing the path to the config file by using "echo"
// as the editor.
Map<String, String> env = new HashMap<>();