@matheusbsbs / matheus-bagliano / commits / abcb66c614

*: fix typos which duplicate a word

Fix typos in documentation, code comments, and RelNotes which repeat various words. In trivial cases, just delete the duplicated word and rewrap text, if needed. Reword the affected sentence in Documentation/RelNotes/1.8.4.txt for it to make sense. Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Andrei Rybak committed Jun 11, 2021 at 13:18 UTC abcb66c614c574cfa1afccb230bf22cbde4d5557

14 files changed +15 -16

Documentation/RelNotes/1.6.0.3.txt

+1 -1

@@ -50,7 +50,7 @@ Fixes since v1.6.0.2

50 if the working tree is currently dirty.

52 * "git for-each-ref --format=%(subject)" fixed for commits with no

53 - no newline in the message body.

53 + newline in the message body.

55 * "git remote" fixed to protect printf from user input.

Documentation/RelNotes/1.8.4.txt

+1 -1

@@ -365,7 +365,7 @@ details).

365 (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint).

366

367 * Invocations of "git checkout" used internally by "git rebase" were

368 - counted as "checkout", and affected later "git checkout -" to the

368 + counted as "checkout", and affected later "git checkout -", which took

369 the user to an unexpected place.

370 (merge 3bed291 rr/rebase-checkout-reflog later to maint).

371

Documentation/RelNotes/2.29.0.txt

+2 -2

@@ -184,8 +184,8 @@ Performance, Internal Implementation, Development Support etc.

184 the ref backend in use, as its format is much richer than the

185 normal refs, and written directly by "git fetch" as a plain file..

186

187 - * An unused binary has been discarded, and and a bunch of commands

188 - have been turned into into built-in.

187 + * An unused binary has been discarded, and a bunch of commands

188 + have been turned into built-in.

189

190 * A handful of places in in-tree code still relied on being able to

191 execute the git subcommands, especially built-ins, in "git-foo"

Documentation/RelNotes/2.8.0.txt

+1 -1

@@ -377,7 +377,7 @@ notes for details).

377 on that order.

378

379 * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a

380 - rev, i.e. the object named by the the pathname with wildcard

380 + rev, i.e. the object named by the pathname with wildcard

381 characters in a tree object.

382 (merge aac4fac nd/dwim-wildcards-as-pathspecs later to maint).

383

Documentation/technical/hash-function-transition.txt

+1 -1

@@ -599,7 +599,7 @@ supports four different modes of operation:

599 convert any object names written to output to SHA-1, but store

600 objects using SHA-256. This allows users to test the code with no

601 visible behavior change except for performance. This allows

602 - allows running even tests that assume the SHA-1 hash function, to

602 + running even tests that assume the SHA-1 hash function, to

603 sanity-check the behavior of the new mode.

604

605 2. ("early transition") Allow both SHA-1 and SHA-256 object names in

Documentation/technical/protocol-v2.txt

+1 -1

@@ -540,7 +540,7 @@ An `object-info` request takes the following arguments:

540 Indicates to the server an object which the client wants to obtain

541 information for.

542

543 -The response of `object-info` is a list of the the requested object ids

543 +The response of `object-info` is a list of the requested object ids

544 and associated requested information, each separated by a single space.

545

546 output = info flush-pkt

attr.c

+1 -1

@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)

685 * Callers into the attribute system assume there is a single, system-wide

686 * global state where attributes are read from and when the state is flipped by

687 * calling git_attr_set_direction(), the stack frames that have been

688 - * constructed need to be discarded so so that subsequent calls into the

688 + * constructed need to be discarded so that subsequent calls into the

689 * attribute system will lazily read from the right place. Since changing

690 * direction causes a global paradigm shift, it should not ever be called while

691 * another thread could potentially be calling into the attribute system.

builtin/log.c

+1 -2

@@ -1968,8 +1968,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)

1968 } else if (rev.diffopt.close_file) {

1969 /*

1970 * The diff code parsed --output; it has already opened the

1971 - * file, but but we must instruct it not to close after each

1972 - * diff.

1971 + * file, but we must instruct it not to close after each diff.

1972 */

1973 rev.diffopt.no_free = 1;

1974 } else {

git-compat-util.h

+1 -1

@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)

1368 (type *)container_of_or_null_offset(ptr, offsetof(type, member))

1369

1370 /*

1371 - * like offsetof(), but takes a pointer to a a variable of type which

1371 + * like offsetof(), but takes a pointer to a variable of type which

1372 * contains @member, instead of a specified type.

1373 * @ptr is subject to multiple evaluation since we can't rely on __typeof__

1374 * everywhere.

git-cvsserver.perl

+1 -1

@@ -2149,7 +2149,7 @@ sub req_diff

2149 ( $meta2->{revision} or "workingcopy" ));

2150

2151 # TODO: Use --label instead of -L because -L is no longer

2152 - # documented and may go away someday. Not sure if there there are

2152 + # documented and may go away someday. Not sure if there are

2153 # versions that only support -L, which would make this change risky?

2154 # http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html

2155 # ("man diff" should actually document the best migration strategy,

merge-recursive.c

+1 -1

@@ -2152,7 +2152,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,

2152 * implicit renaming of files that should be left in place. (See

2153 * testcase 6b in t6043 for details.)

2154 * 2. Prune directory renames if there are still files left in the

2155 - * the original directory. These represent a partial directory rename,

2155 + * original directory. These represent a partial directory rename,

2156 * i.e. a rename where only some of the files within the directory

2157 * were renamed elsewhere. (Technically, this could be done earlier

2158 * in get_directory_renames(), except that would prevent us from

remote.c

+1 -1

@@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,

1592 else

1593 /*

1594 * If the ref isn't stale, and is reachable

1595 - * from from one of the reflog entries of

1595 + * from one of the reflog entries of

1596 * the local branch, force the update.

1597 */

1598 force_ref_update = 1;

t/t5505-remote.sh

+1 -1

@@ -182,7 +182,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'

182 )

183 '

184

185 -test_expect_success 'rename errors out early when when new name is invalid' '

185 +test_expect_success 'rename errors out early when new name is invalid' '

186 test_config remote.foo.vcs bar &&

187 echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&

188 test_must_fail git remote rename foo invalid...name 2>actual &&

t/t9100-git-svn-basic.sh

+1 -1

@@ -330,7 +330,7 @@ test_expect_success 'git-svn works in a bare repository' '

330 git svn fetch ) &&

331 rm -rf bare-repo

332 '

333 -test_expect_success 'git-svn works in in a repository with a gitdir: link' '

333 +test_expect_success 'git-svn works in a repository with a gitdir: link' '

334 mkdir worktree gitdir &&

335 ( cd worktree &&

336 git svn init "$svnrepo" &&