From: Markus Duft <markus.duft@ssi-schaefer.com>
Date: Thu, 29 Mar 2018 13:28:07 +0000 (+0200)
Subject: Don't throw if a pre-push hook is ignored.
X-Git-Tag: v5.0.0.201805151920-m7~45
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F120438%2F3;p=jgit.git

Don't throw if a pre-push hook is ignored.

This breaks any scenario where native git (with LFS) clones a repository
(and thus installs the hook) and later on JGit is used to push changes.

Change-Id: I2a17753377265a0b612ba3451b9df63a577a1c38
Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
---

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/hooks/Hooks.java b/org.eclipse.jgit/src/org/eclipse/jgit/hooks/Hooks.java
index 79395ed23f..b801d6872b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/hooks/Hooks.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/hooks/Hooks.java
@@ -115,7 +115,11 @@ public class Hooks {
 					outputStream);
 			if (hook != null) {
 				if (hook.isNativeHookPresent()) {
-					throw new IllegalStateException(MessageFormat
+					PrintStream ps = outputStream;
+					if (ps == null) {
+						ps = System.out;
+					}
+					ps.println(MessageFormat
 							.format(JGitText.get().lfsHookConflict, repo));
 				}
 				return hook;