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>
This commit is contained in:
Jonathan Nieder 2018-10-07 03:40:23 +00:00
commit 735f79c663
1 changed files with 2 additions and 2 deletions

View File

@ -1240,11 +1240,11 @@ private String normalize(byte[] raw, int ptr, int end) {
}
/**
* 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
*/