Browse Source

Merge branch 'stable-4.10' into stable-4.11

* stable-4.10:
  ObjectChecker#getGitsubmodules: Fix malformed javadoc

Change-Id: Id2c8d1d4ffdf7bf18ef64479cfa1e959d9b2c37e
Signed-off-by: Jonathan Nieder <jrn@google.com>
stable-4.11
Jonathan Nieder 6 years ago
parent
commit
735f79c663
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java

@ -1240,11 +1240,11 @@ public class ObjectChecker {
} }
/** /**
* Get the list of".gitmodules" files found in the pack. For each, report * Get the list of ".gitmodules" files found in the pack. For each, report
* its blob id (e.g. to validate its contents) and the tree where it was * its blob id (e.g. to validate its contents) and the tree where it was
* found (e.g. to check if it is in the root) * found (e.g. to check if it is in the root)
* *
* @return List of pairs of ids <tree, blob> * @return List of pairs of ids {@literal <tree, blob>}.
* *
* @since 4.7.5 * @since 4.7.5
*/ */

Loading…
Cancel
Save