diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java index 540b586dd..cfd3d19a7 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java @@ -134,7 +134,7 @@ import org.slf4j.LoggerFactory; *

* Note that adding a key to the known hosts file may create the file. You can * specify in the constructor whether the user shall be asked about that, too. - * If the the user declines updating the file, but the key was otherwise + * If the user declines updating the file, but the key was otherwise * accepted (user confirmed for "ask", or "no" or "accept-new" are * active), the key is accepted for this session only. *

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java index 7421e907d..837de7481 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java @@ -64,7 +64,7 @@ import org.junit.Before; import org.junit.Test; /** - * Tests attributes node behavior on the the index. + * Tests attributes node behavior on the index. */ public class AttributesNodeDirCacheIteratorTest extends RepositoryTestCase { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java index 643bb4946..9ea62b34d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java @@ -169,7 +169,7 @@ public class GcConcurrentTest extends GcTestCase { gc2.gc(); // Simulate parts of an UploadPack. This is the situation on - // server side (e.g. gerrit) when when clients are + // server side (e.g. gerrit) when clients are // cloning/fetching while the server side repo's // are gc'ed by an external process (e.g. scheduled // native git gc) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java index 8ca5d453f..335a8ca1a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java @@ -1069,7 +1069,7 @@ public class MergerTest extends RepositoryTestCase { git.add().addFilepattern("c.txt").call(); git.commit().setMessage("added c.txt").call(); - // Get a handle to the the file so on windows it can't be deleted. + // Get a handle to the file so on windows it can't be deleted. try (FileInputStream fis = new FileInputStream( new File(db.getWorkTree(), "b.txt"))) { MergeResult mergeRes = git.merge().setStrategy(strategy) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java index d7b7a31bd..e60d75793 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java @@ -54,7 +54,7 @@ import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.URIish; /** - * Used to to change the URL of a remote. + * Used to change the URL of a remote. * * This class has setters for all supported options and arguments of this * command and a {@link #call()} method to finally execute the command. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/JGitInternalException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/JGitInternalException.java index 57d8a13d1..7959013a1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/JGitInternalException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/JGitInternalException.java @@ -44,7 +44,7 @@ package org.eclipse.jgit.api.errors; *

* During command execution a lot of exceptions may be thrown. Some of them * represent error situations which can be handled specifically by the caller of - * the command. But a lot of exceptions are so low-level that is is unlikely + * the command. But a lot of exceptions are so low-level that is unlikely * that the caller of the command can handle them effectively. The huge number * of these low-level exceptions which are thrown by the commands lead to a * complicated and wide interface of the commands. Callers of the API have to diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SequenceComparator.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SequenceComparator.java index ccd005558..3bc95a2f2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SequenceComparator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SequenceComparator.java @@ -84,7 +84,7 @@ public abstract class SequenceComparator { * method must produce the same integer result for both items. * * It is not required for two items to have different hash values if they - * are are unequal according to the {@code equals()} method. + * are unequal according to the {@code equals()} method. * * @param seq * the sequence. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java index 5897ffb75..539f2370e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java @@ -236,7 +236,7 @@ public class SimilarityIndex { * A region of a file is defined as a line in a text file or a fixed-size * block in a binary file. To prepare an index, each region in the file is * hashed; the values and counts of hashes are retained in a sorted table. - * Define the similarity fraction F as the the count of matching regions + * Define the similarity fraction F as the count of matching regions * between the two files divided between the maximum count of regions in * either file. The similarity score is F multiplied by the maxScore * constant, yielding a range [0, maxScore]. It is defined as maxScore for diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index e9d86dfa8..cb62925a1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -147,7 +147,7 @@ public class RepoCommand extends GitCommand { * The URI of the remote repository * @param ref * Name of the ref to lookup. May be a short-hand form, e.g. - * "master" which is is automatically expanded to + * "master" which is automatically expanded to * "refs/heads/master" if "refs/heads/master" already exists. * @return the sha1 of the remote repository, or null if the ref does * not exist. @@ -187,7 +187,7 @@ public class RepoCommand extends GitCommand { * The URI of the remote repository * @param ref * Name of the ref to lookup. May be a short-hand form, e.g. - * "master" which is is automatically expanded to + * "master" which is automatically expanded to * "refs/heads/master" if "refs/heads/master" already exists. * @param path * The relative path (inside the repo) to the file to read diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java index 8cf1d4e21..e8fac514b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java @@ -146,7 +146,7 @@ public class WindowCache { * Modify the configuration of the window cache. *

* The new configuration is applied immediately. If the new limits are - * smaller than what what is currently cached, older entries will be purged + * smaller than what is currently cached, older entries will be purged * as soon as possible to allow the cache to meet the new limit. * * @deprecated use {@code cfg.install()} to avoid internal reference. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaEncoder.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaEncoder.java index 343faf4df..cfc1ccd62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaEncoder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaEncoder.java @@ -73,7 +73,7 @@ public class DeltaEncoder { /** Maximum number of bytes used by a copy instruction. */ private static final int MAX_COPY_CMD_SIZE = 8; - /** Maximum length that an an insert command can encode at once. */ + /** Maximum length that an insert command can encode at once. */ private static final int MAX_INSERT_DATA_SIZE = 127; private final OutputStream out; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java index 7b872b186..cd6af6a12 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java @@ -61,7 +61,7 @@ import org.eclipse.jgit.lib.ObjectChecker; * Validations for the git submodule fields (name, path, uri). * * Invalid values in these fields can cause security problems as reported in - * CVE-2018-11235 and and CVE-2018-17456 + * CVE-2018-11235 and CVE-2018-17456 */ public class SubmoduleValidator { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 77d268a3b..b72b7629f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -297,7 +297,7 @@ public abstract class Repository implements AutoCloseable { /** * Get the used file system abstraction. * - * @return the used file system abstraction, or or {@code null} if + * @return the used file system abstraction, or {@code null} if * repository isn't local. */ /* @@ -1079,7 +1079,7 @@ public abstract class Repository implements AutoCloseable { * * @param name * the name of the ref to lookup. May be a short-hand form, e.g. - * "master" which is is automatically expanded to + * "master" which is automatically expanded to * "refs/heads/master" if "refs/heads/master" already exists. * @return the Ref with the given name, or {@code null} if it does not exist * @throws java.io.IOException diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java index 062d86f8a..a533bf565 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java @@ -119,7 +119,7 @@ public class MergeResult implements Iterable { /** * Returns the common predecessor sequence and the merged sequence in one - * list. The common predecessor is is the first element in the list + * list. The common predecessor is the first element in the list * * @return the common predecessor at position 0 followed by the merged * sequences. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java b/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java index 89a87af9e..375cd3204 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java @@ -79,7 +79,7 @@ public class NLS { /** * Sets the locale for the calling thread. *

- * The {@link #getBundleFor(Class)} method will honor this setting if if it + * The {@link #getBundleFor(Class)} method will honor this setting if it * is supported by the provided resource bundle property files. Otherwise, * it will use a fall back locale as described in the * {@link TranslationBundle} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java index e5903c911..fd578da33 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java @@ -330,11 +330,11 @@ public class ObjectWalk extends RevWalk { * * @return next most recent object; null if traversal is over. * @throws org.eclipse.jgit.errors.MissingObjectException - * one or or more of the next objects are not available from the + * one or more of the next objects are not available from the * object database, but were thought to be candidates for * traversal. This usually indicates a broken link. * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException - * one or or more of the objects in a tree do not match the type + * one or more of the objects in a tree do not match the type * indicated. * @throws java.io.IOException * a pack file or loose object could not be read. @@ -534,11 +534,11 @@ public class ObjectWalk extends RevWalk { * provides some detail about the connectivity failure. * * @throws org.eclipse.jgit.errors.MissingObjectException - * one or or more of the next objects are not available from the + * one or more of the next objects are not available from the * object database, but were thought to be candidates for * traversal. This usually indicates a broken link. * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException - * one or or more of the objects in a tree do not match the type + * one or more of the objects in a tree do not match the type * indicated. * @throws java.io.IOException * a pack file or loose object could not be read. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index 400ea33c2..0a43e8fb1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -394,11 +394,11 @@ public class RevWalk implements Iterable, AutoCloseable { * base (and thus base is fully merged * into tip); false otherwise. * @throws org.eclipse.jgit.errors.MissingObjectException - * one or or more of the next commit's parents are not available + * one or more of the next commit's parents are not available * from the object database, but were thought to be candidates * for traversal. This usually indicates a broken link. * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException - * one or or more of the next commit's parents are not actually + * one or more of the next commit's parents are not actually * commit objects. * @throws java.io.IOException * a pack file or loose object could not be read. @@ -431,11 +431,11 @@ public class RevWalk implements Iterable, AutoCloseable { * * @return next most recent commit; null if traversal is over. * @throws org.eclipse.jgit.errors.MissingObjectException - * one or or more of the next commit's parents are not available + * one or more of the next commit's parents are not available * from the object database, but were thought to be candidates * for traversal. This usually indicates a broken link. * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException - * one or or more of the next commit's parents are not actually + * one or more of the next commit's parents are not actually * commit objects. * @throws java.io.IOException * a pack file or loose object could not be read. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheConfig.java index c2e6a4200..ff499764c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheConfig.java @@ -251,7 +251,7 @@ public class WindowCacheConfig { * Install this configuration as the live settings. *

* The new configuration is applied immediately. If the new limits are - * smaller than what what is currently cached, older entries will be purged + * smaller than what is currently cached, older entries will be purged * as soon as possible to allow the cache to meet the new limit. * * @since 3.0 diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java index 256e41d22..ed3fe2aab 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java @@ -1006,7 +1006,7 @@ public class PackConfig { } /** - * Get the the age in days that marks a branch as "inactive". + * Get the age in days that marks a branch as "inactive". * * Default setting: {@value #DEFAULT_BITMAP_INACTIVE_BRANCH_AGE_IN_DAYS} * @@ -1018,7 +1018,7 @@ public class PackConfig { } /** - * Set the the age in days that marks a branch as "inactive". + * Set the age in days that marks a branch as "inactive". * * Default setting: {@value #DEFAULT_BITMAP_INACTIVE_BRANCH_AGE_IN_DAYS} * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalHttpServerGlue.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalHttpServerGlue.java index fe7aaf769..075cc9c11 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalHttpServerGlue.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalHttpServerGlue.java @@ -44,7 +44,7 @@ package org.eclipse.jgit.transport; /** - * Internal API to to assist {@code org.eclipse.jgit.http.server}. + * Internal API to assist {@code org.eclipse.jgit.http.server}. *

* Do not call. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/NonceGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/NonceGenerator.java index fc2203434..c573d1248 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/NonceGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/NonceGenerator.java @@ -81,7 +81,7 @@ public interface NonceGenerator { * such that the pusher cannot forge nonces by pushing to another * repository at the same time as well and reusing the nonce. * @param allowSlop - * If the receiving backend is is able to generate slop. This is + * If the receiving backend is able to generate slop. This is * the case for serving via http protocol using more than one * http frontend. The client would talk to different http * frontends, which may have a slight difference of time due to diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java index 49acb4d9d..2b2795fef 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java @@ -1237,7 +1237,7 @@ public abstract class PackParser { bAvail -= cnt; } - // Ensure at least need bytes are available in in {@link #buf}. + // Ensure at least need bytes are available in {@link #buf}. int fill(Source src, int need) throws IOException { while (bAvail < need) { int next = bOffset + bAvail; @@ -1568,7 +1568,7 @@ public abstract class PackParser { long inflatedSize) throws IOException; /** - * Event notifying the the current object. + * Event notifying the current object. * *@param info * object information. @@ -1616,7 +1616,7 @@ public abstract class PackParser { AnyObjectId baseId, long inflatedSize) throws IOException; /** - * Event notifying the the current object. + * Event notifying the current object. * *@return object information that must be populated with at least the * offset. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java index 6d4df4fba..5c67253cf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java @@ -348,7 +348,7 @@ abstract class WalkRemoteObjectDatabase { /** * Open a buffered reader around a file. *

- * This method is suitable for for reading line-oriented resources like + * This method is suitable for reading line-oriented resources like * info/packs, info/refs, and the alternates list. * * @return a stream to read from the file. Never null.