aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/lib
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2020-11-27 00:29:39 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2020-11-27 00:29:53 +0100
commita74c0cd333c11658afac2fd931f02bf6e1909153 (patch)
tree65e00c74d62e639ed1511096c5495d035594e3ad /org.eclipse.jgit/src/org/eclipse/jgit/lib
parent044e70511a91144dc30205ff810e91b3808ce01e (diff)
parentfdcdfc37a302ca1ff6077bbae45f6a79450c3bfe (diff)
downloadjgit-a74c0cd333c11658afac2fd931f02bf6e1909153.tar.gz
jgit-a74c0cd333c11658afac2fd931f02bf6e1909153.zip
Merge branch 'stable-5.3' into stable-5.4
* stable-5.3: Prepare 5.3.9-SNAPSHOT builds JGit v5.3.8.202011260953-r Prepare 5.1.15-SNAPSHOT builds JGit v5.1.14.202011251942-r GC#deleteOrphans: log warning for deleted orphaned files GC#deleteOrphans: handle failure to list files in pack directory Ensure that GC#deleteOrphans respects pack lock Update API warning filters Remove unused imports Change-Id: I82576ad0f61cf3ff11b54691b32666c61401ad9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/GitmoduleEntry.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitmoduleEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitmoduleEntry.java
index bded527519..4f2e558b26 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitmoduleEntry.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitmoduleEntry.java
@@ -42,8 +42,6 @@
*/
package org.eclipse.jgit.lib;
-import org.eclipse.jgit.lib.AnyObjectId;
-
/**
* A .gitmodules file found in the pack. Store the blob of the file itself (e.g.
* to access its contents) and the tree where it was found (e.g. to check if it