Avoid double words
Change-Id: I0fdf595cba93f5a5cdd0496cee07ac91db304532 Signed-off-by: Mincong Huang <mincong.h@gmail.com>
This commit is contained in:
Mincong HUANG
parent
8f11539265
commit
d09388e156
|
|
@ -134,7 +134,7 @@
|
|||
* <p>
|
||||
* 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 "<b>ask</b>", or "no" or "accept-new" are
|
||||
* active), the key is accepted for this session only.
|
||||
* </p>
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Tests attributes node behavior on the the index.
|
||||
* Tests attributes node behavior on the index.
|
||||
*/
|
||||
public class AttributesNodeDirCacheIteratorTest extends RepositoryTestCase {
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ public void repackAndUploadPack() throws Exception {
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -1069,7 +1069,7 @@ public void checkLockedFilesToBeDeleted(MergeStrategy strategy)
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
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.
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
* <p>
|
||||
* 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
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ public abstract class SequenceComparator<S extends Sequence> {
|
|||
* 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.
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ void sort() {
|
|||
* 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
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ public interface RemoteReader {
|
|||
* 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 default byte[] readFile(String uri, String ref, String path)
|
|||
* 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
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ private static final int bits(int newSize) {
|
|||
* Modify the configuration of the window cache.
|
||||
* <p>
|
||||
* 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.
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
* 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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ public ObjectReader newObjectReader() {
|
|||
/**
|
||||
* 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 final Ref exactRef(String name) throws IOException {
|
|||
*
|
||||
* @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
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ public void add(int srcIdx, int begin, int end, ConflictState conflictState) {
|
|||
|
||||
/**
|
||||
* 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.
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ public class NLS {
|
|||
/**
|
||||
* Sets the locale for the calling thread.
|
||||
* <p>
|
||||
* 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}
|
||||
|
|
|
|||
|
|
@ -330,11 +330,11 @@ public RevCommit next() throws MissingObjectException,
|
|||
*
|
||||
* @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 @@ private static int parseMode(byte[] buf, int startPtr, int recEndPtr, TreeVisit
|
|||
* 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.
|
||||
|
|
|
|||
|
|
@ -394,11 +394,11 @@ public void markUninteresting(RevCommit c)
|
|||
* <code>base</code> (and thus <code>base</code> is fully merged
|
||||
* into <code>tip</code>); 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 boolean isMergedInto(RevCommit base, RevCommit tip)
|
|||
*
|
||||
* @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.
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ public WindowCacheConfig fromConfig(Config rc) {
|
|||
* Install this configuration as the live settings.
|
||||
* <p>
|
||||
* 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
|
||||
|
|
|
|||
|
|
@ -1006,7 +1006,7 @@ public void setBitmapExcessiveBranchCount(int count) {
|
|||
}
|
||||
|
||||
/**
|
||||
* 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 int getBitmapInactiveBranchAgeInDays() {
|
|||
}
|
||||
|
||||
/**
|
||||
* 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}
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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}.
|
||||
* <p>
|
||||
* <b>Do not call.</b>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ String createNonce(Repository db, long timestamp)
|
|||
* 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
|
||||
|
|
|
|||
|
|
@ -1237,7 +1237,7 @@ void use(int cnt) {
|
|||
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 @@ protected abstract void onBeginWholeObject(long streamPosition, int type,
|
|||
long inflatedSize) throws IOException;
|
||||
|
||||
/**
|
||||
* Event notifying the the current object.
|
||||
* Event notifying the current object.
|
||||
*
|
||||
*@param info
|
||||
* object information.
|
||||
|
|
@ -1616,7 +1616,7 @@ protected abstract void onBeginRefDelta(long deltaStreamPosition,
|
|||
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.
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ void writeInfoPacks(Collection<String> packNames) throws IOException {
|
|||
/**
|
||||
* Open a buffered reader around a file.
|
||||
* <p>
|
||||
* This method is suitable for for reading line-oriented resources like
|
||||
* This method is suitable for reading line-oriented resources like
|
||||
* <code>info/packs</code>, <code>info/refs</code>, and the alternates list.
|
||||
*
|
||||
* @return a stream to read from the file. Never null.
|
||||
|
|
|
|||
Loading…
Reference in New Issue