diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:45:28 +0000 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:45:28 +0000 |
| commit | c1ef0d2cfdb831da900f74095f55ff88a2d8ee52 (patch) | |
| tree | 95d367894a41afcaf5ca1a471be46005f266356a | |
| parent | 2078b23ceebc2a021941ab6f7a6e7f7fdb5e34d5 (diff) | |
| parent | 3e73672c06c3c369449c1463a869d31004957fcc (diff) | |
| download | jgit-c1ef0d2cfdb831da900f74095f55ff88a2d8ee52.tar.gz jgit-c1ef0d2cfdb831da900f74095f55ff88a2d8ee52.zip | |
Merge branch 'stable-5.0' into stable-5.1
* stable-5.0:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: Ib32077c6640621670649fa4fbfcc8d0c9d8346f1
Signed-off-by: Jonathan Nieder <jrn@google.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java index 59e2834cb8..d37fb21c93 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java +++ b/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 * 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 */ |