diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-12-05 10:46:40 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-12-05 10:46:44 +0900 |
| commit | f350e889d69cb895009e8c10b59a836e359d022c (patch) | |
| tree | f01b0cfe47f972c0fccb8c7f3468c71642869e7a /org.eclipse.jgit/src/org/eclipse | |
| parent | a4ad83c96c2bcaed2487ad5cd6fc39d6aed38f00 (diff) | |
| parent | b24ec8f7159469340e4519b42bf5a57a44b75c38 (diff) | |
| download | jgit-f350e889d69cb895009e8c10b59a836e359d022c.tar.gz jgit-f350e889d69cb895009e8c10b59a836e359d022c.zip | |
Merge branch 'stable-5.6'
* stable-5.6:
ReftableTest: Clean up boxing warnings on usage of String.format
MergedReftable: Remove unnecessary semicolon
Change-Id: Id35406acfdd91c3ddf17ce4e1023395f774774f2
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java index 6c312ca7a0..0144453cd7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java @@ -104,7 +104,7 @@ public class MergedReftable extends Reftable { boolean has = true; for (int i = 0; has && i < tables.length; i++) { has = has && tables[i].hasObjectMap(); - }; + } return has; } |