motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Markus Duft 2018-03-29 15:28:07 +02:00 committed by David Pursehouse
parent 045799f2ec
commit aaf4b35557
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/hooks/Hooks.java
View File

@ -115,7 +115,11 @@ public static PrePushHook prePush(Repository repo, PrintStream outputStream) {
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;