From 8a53d7e2fd5b84c57c08ec3912ed61612edb7cb9 Mon Sep 17 00:00:00 2001
From: Kaloyan Raev <kaloyan.r@zend.com>
Date: Tue, 27 Oct 2015 16:14:54 +0200
Subject: [PATCH] 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>
---
 org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index d860d8ac7..f5cdab0f4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -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<>();