diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-10-07 11:04:18 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-10-07 11:04:24 +0900 |
| commit | f6eb78555195f5c0f011e7af6f284a745a5eb366 (patch) | |
| tree | a48b5a23be4cd54f2e29fdcf6812c2d6b9ad71e3 | |
| parent | a8bd7dcc5835864da48e9fb4ade434ae5d4600b2 (diff) | |
| parent | df8bd762a17c2459576104d7f81d7ecca962799d (diff) | |
| download | jgit-f6eb78555195f5c0f011e7af6f284a745a5eb366.tar.gz jgit-f6eb78555195f5c0f011e7af6f284a745a5eb366.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: I51ddd8fa1c2fbcabfb010bc4662d2c925563b55a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.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 6ae752c1f5..d8ddcd5e48 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java @@ -1209,11 +1209,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 */ |