diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:37:46 +0000 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:38:26 +0000 |
| commit | acd35d538413a208f963ebfe4088f6edf46ab749 (patch) | |
| tree | d0fc070e0278f7c88dfe921d5e973008a103343c | |
| parent | bf7a611dacd52d99b8330020f54f29b5892fce8b (diff) | |
| parent | f6eb78555195f5c0f011e7af6f284a745a5eb366 (diff) | |
| download | jgit-acd35d538413a208f963ebfe4088f6edf46ab749.tar.gz jgit-acd35d538413a208f963ebfe4088f6edf46ab749.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: Ic73df5571e1ae86e5e026d0bf9d8e9e330cbfa97
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 e5fbc1a857..6cc2afad8a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java @@ -1229,11 +1229,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 */ |