fix typos which duplicate a word
PATCH 1/1 fix typos which duplicate a word
Fix typos in documentation and code comments which repeat various words. These typos were found by searching using scripts like this:
for w in $(grep '^....$' /usr/share/dict/words) do git grep -P "\b$w $w\b" done
---
I'm not sure what to put as the "area: " prefix for this patch, as it touches both docs and code comments.
Documentation/technical/protocol-v2.txt | 2 +- attr.c | 2 +- builtin/log.c | 3 +-- git-compat-util.h | 2 +- git-cvsserver.perl | 2 +- remote.c | 2 +- t/t5505-remote.sh | 2 +- t/t6416-recursive-corner-cases.sh | 2 +- t/t9100-git-svn-basic.sh | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-)
Documentation/technical/protocol-v2.txt +1 -1
@@ -540,7 +540,7 @@ An `object-info` request takes the following arguments: Indicates to the server an object which the client wants to obtain information for. -The response of `object-info` is a list of the the requested object ids +The response of `object-info` is a list of the requested object ids and associated requested information, each separated by a single space. output = info flush-pkt
attr.c +1 -1
@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)* Callers into the attribute system assume there is a single, system-wide * global state where attributes are read from and when the state is flipped by * calling git_attr_set_direction(), the stack frames that have been -* constructed need to be discarded so so that subsequent calls into the +* constructed need to be discarded so that subsequent calls into the * attribute system will lazily read from the right place. Since changing * direction causes a global paradigm shift, it should not ever be called while * 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) }else if (rev.diffopt.close_file) {/* * The diff code parsed --output; it has already opened the -* file, but but we must instruct it not to close after each -* diff. +* file, but we must instruct it not to close after each diff. */ rev.diffopt.no_free =1 ; }else {
git-compat-util.h +1 -1
@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) (type *)container_of_or_null_offset (ptr, offsetof(type , member))/* -* like offsetof(), but takes a pointer to a a variable of type which +* like offsetof(), but takes a pointer to a variable of type which * contains @member, instead of a specified type. * @ptr is subject to multiple evaluation since we can't rely on __typeof__ * everywhere.
git-cvsserver.perl +1 -1
@@ -2149,7 +2149,7 @@ sub req_diff ( $meta2->{revision} or "workingcopy" )); # TODO: Use --label instead of -L because -L is no longer - # documented and may go away someday. Not sure if there there are + # documented and may go away someday. Not sure if there are # versions that only support -L, which would make this change risky? # http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html # ("man diff" should actually document the best migration strategy,
remote.c +1 -1
@@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,else /* * If the ref isn't stale, and is reachable -* from from one of the reflog entries of +* from one of the reflog entries of * the local branch, force the update. */ 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' ) ' -test_expect_success 'rename errors out early when when new name is invalid' ' +test_expect_success 'rename errors out early when new name is invalid' ' test_config remote.foo.vcs bar && echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect && test_must_fail git remote rename foo invalid...name 2>actual &&
t/t6416-recursive-corner-cases.sh +1 -1
@@ -871,7 +871,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file' # it feels sound to say "B and C do not agree what the final pathname # should be, but we know this content was derived from the common A:a so we # use one path whose name is arbitrary in the virtual merge base X between -# D and E" and then further let the rename detection to notice that that +# D and E" and then further let the rename detection to notice that # arbitrary path gets renamed between X-D to "newname" and X-E also to # "newname" to resolve it as both sides renaming it to the same new # name. It is akin to what we do at the content level, i.e. "B and C do not
t/t9100-git-svn-basic.sh +1 -1
@@ -330,7 +330,7 @@ test_expect_success 'git-svn works in a bare repository' ' git svn fetch ) && rm -rf bare-repo ' -test_expect_success 'git-svn works in in a repository with a gitdir: link' ' +test_expect_success 'git-svn works in a repository with a gitdir: link' ' mkdir worktree gitdir && ( cd worktree && git svn init "$svnrepo" &&
Signature · 1 line
2.31.1
Quoted 7 lines · Andrei Rybak
Fix typos in documentation and code comments which repeat various words. These typos were found by searching using scripts like this:
[...]Signed-off-by Andrei Rybak <[email protected]>---
t/t6416-recursive-corner-cases.sh test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file' · line 877
Quoted 8 lines
t/t6416-recursive-corner-cases.sh +1
-1@@ -871,7 +871,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file' # it feels sound to say "B and C do not agree what the final pathname # should be, but we know this content was derived from the common A:a so we # use one path whose name is arbitrary in the virtual merge base X between -# D and E" and then further let the rename detection to notice that that +# D and E" and then further let the rename detection to notice that # arbitrary path gets renamed between X-D to "newname" and X-E also to # "newname" to resolve it as both sides renaming it to the same new # name. It is akin to what we do at the content level, i.e. "B and C do not
All the other fixes for duplicate words look "obviously correct", but in this case, the duplicate "that that" is likely intentional and grammatically sensible, so perhaps drop this hunk from the patch?
Quoted 9 lines · Andrei Rybak
Fix typos in documentation and code comments which repeat various words. These typos were found by searching using scripts like this:
for w in $(grep '^....$' /usr/share/dict/words) do git grep -P "\b$w $w\b" doneSigned-off-by Andrei Rybak <[email protected]>
Other than the 'that that' in t6416-recursive-corner-cases.sh everything looks obviously correct.
Quoted 4 lines
---
I'm not sure what to put as the "area: " prefix for this patch, as it touches both docs and code comments.
Not every patch needs to have an area, but when there's no area you need to use uppercase.
Fix typos which duplicate a word
Signature · 1 line
Felipe Contreras
PATCH v2 1/1 *: fix typos which duplicate a word
In reply to Andrei RybakFix typos in documentation and code comments which repeat various words. These typos were found by searching using scripts like this:
for w in $(grep '^....$' /usr/share/dict/words) do git grep -P "\b$w $w\b" done
---
Thanks to Felipe Contreras for review.
Changes from v1:
- added "*: " as area prefix to follow example of Derrick Stolee
https://lore.kernel.org/git/c40ad4a058a75d57adc97b8252ad0f57600b8d86.1623085069.git.gitgitgadget@gmail.com/
- Dropped change in t/t6416-recursive-corner-cases.sh where I misread a sentence and the duplicated word "that" is used correctly. Quote for reference:
... so we use one path whose name is arbitrary in the virtual merge base X between D and E" and then further let the rename detection to notice that that arbitrary path gets renamed ...
where first "that" is a conjunction between clauses "we let" and "path gets renamed" and second "that" is a determiner to qualify "arbitrary path" to refer to "one path" mentioned in the first clause
Documentation/technical/protocol-v2.txt | 2 +- attr.c | 2 +- builtin/log.c | 3 +-- git-compat-util.h | 2 +- git-cvsserver.perl | 2 +- remote.c | 2 +- t/t5505-remote.sh | 2 +- t/t9100-git-svn-basic.sh | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-)
Documentation/technical/protocol-v2.txt +1 -1
@@ -540,7 +540,7 @@ An `object-info` request takes the following arguments: Indicates to the server an object which the client wants to obtain information for. -The response of `object-info` is a list of the the requested object ids +The response of `object-info` is a list of the requested object ids and associated requested information, each separated by a single space. output = info flush-pkt
attr.c +1 -1
@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)* Callers into the attribute system assume there is a single, system-wide * global state where attributes are read from and when the state is flipped by * calling git_attr_set_direction(), the stack frames that have been -* constructed need to be discarded so so that subsequent calls into the +* constructed need to be discarded so that subsequent calls into the * attribute system will lazily read from the right place. Since changing * direction causes a global paradigm shift, it should not ever be called while * 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) }else if (rev.diffopt.close_file) {/* * The diff code parsed --output; it has already opened the -* file, but but we must instruct it not to close after each -* diff. +* file, but we must instruct it not to close after each diff. */ rev.diffopt.no_free =1 ; }else {
git-compat-util.h +1 -1
@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) (type *)container_of_or_null_offset (ptr, offsetof(type , member))/* -* like offsetof(), but takes a pointer to a a variable of type which +* like offsetof(), but takes a pointer to a variable of type which * contains @member, instead of a specified type. * @ptr is subject to multiple evaluation since we can't rely on __typeof__ * everywhere.
git-cvsserver.perl +1 -1
@@ -2149,7 +2149,7 @@ sub req_diff ( $meta2->{revision} or "workingcopy" )); # TODO: Use --label instead of -L because -L is no longer - # documented and may go away someday. Not sure if there there are + # documented and may go away someday. Not sure if there are # versions that only support -L, which would make this change risky? # http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html # ("man diff" should actually document the best migration strategy,
remote.c +1 -1
@@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,else /* * If the ref isn't stale, and is reachable -* from from one of the reflog entries of +* from one of the reflog entries of * the local branch, force the update. */ 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' ) ' -test_expect_success 'rename errors out early when when new name is invalid' ' +test_expect_success 'rename errors out early when new name is invalid' ' test_config remote.foo.vcs bar && echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect && 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' ' git svn fetch ) && rm -rf bare-repo ' -test_expect_success 'git-svn works in in a repository with a gitdir: link' ' +test_expect_success 'git-svn works in a repository with a gitdir: link' ' mkdir worktree gitdir && ( cd worktree && git svn init "$svnrepo" &&
Signature · 1 line
2.31.1
RE: [PATCH v2] *: fix typos which duplicate a word
Quoted 1 line
Subject: *: fix typos which duplicate a word
This is still awkward to me. "Fix typos..." is much better.
Signature · 1 line
Felipe Contreras
Re: [PATCH v2] *: fix typos which duplicate a word
In reply to Andrei RybakQuoted 1 line · Andrei Rybak
Subject: Re: [PATCH v2] *: fix typos which duplicate a word
I think Derrick started this use of "*:" prefix to mean "not limited to any particular area, but applies to everything" and it makes sense.
Quoted 1 line
Fix typos in documentation and code comments which repeat various words.
Thanks.
Quoted 6 lines
These typos were found by searching using scripts like this:
for w in $(grep '^....$' /usr/share/dict/words) do git grep -P "\b$w $w\b" done
This is clarifying and somewhat puzzling at the same time.
It says that doubled words that span across line folding, and doubled words that do not have exactly a single space in between, have gone undetected (which is fine and may be useful information) by showing that it grepped for lines that has doubled words. But it also says that you only looked for four-letter words, which I do not believe is the case (you fixed "the the", for example), which is misleading. The "like this" part can be an excuse for that inaccuracy, but then the whole thing pretty much has already been summarized nicely with your first line already, i.e. "which repeate various words". If you update it the end part of the sentence to "which repeat various words on the same line", then the entire paragaph can go without losing clarity.
Not a huge deal, though.
The changes themselves all look good to me. Thanks. Will apply.
Quoted 136 lines
Signed-off-by Andrei Rybak <[email protected]>---
Thanks to Felipe Contreras for review.
Changes from v1:
- added "*: " as area prefix to follow example of Derrick Stolee
https://lore.kernel.org/git/c40ad4a058a75d57adc97b8252ad0f57600b8d86.1623085069.git.gitgitgadget@gmail.com/- Dropped change in
t/t6416-recursive-corner-cases.shwhere I misread a sentence and the duplicated word "that" is used correctly. Quote for reference:... so we use one path whose name is arbitrary in the virtual merge base X between D and E" and then further let the rename detection to notice that that arbitrary path gets renamed ...
where first "that" is a conjunction between clauses "we let" and "path gets renamed" and second "that" is a determiner to qualify "arbitrary path" to refer to "one path" mentioned in the first clause
Documentation/technical/protocol-v2.txt | 2 +- attr.c | 2 +- builtin/log.c | 3 +-- git-compat-util.h | 2 +- git-cvsserver.perl | 2 +- remote.c | 2 +- t/t5505-remote.sh | 2 +- t/t9100-git-svn-basic.sh | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-)Documentation/technical/protocol-v2.txt +1
-1@@ -540,7 +540,7 @@ An `object-info` request takes the following arguments: Indicates to the server an object which the client wants to obtain information for. -The response of `object-info` is a list of the the requested object ids +The response of `object-info` is a list of the requested object ids and associated requested information, each separated by a single space. output = info flush-pktattr.c +1
-1@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)* Callers into the attribute system assume there is a single, system-wide * global state where attributes are read from and when the state is flipped by * calling git_attr_set_direction(), the stack frames that have been -* constructed need to be discarded so so that subsequent calls into the +* constructed need to be discarded so that subsequent calls into the * attribute system will lazily read from the right place. Since changing * direction causes a global paradigm shift, it should not ever be called while * 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) }else if (rev.diffopt.close_file) {/* * The diff code parsed --output; it has already opened the -* file, but but we must instruct it not to close after each -* diff. +* file, but we must instruct it not to close after each diff. */ rev.diffopt.no_free =1 ; }else {git-compat-util.h +1
-1@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) (type *)container_of_or_null_offset (ptr, offsetof(type , member))/* -* like offsetof(), but takes a pointer to a a variable of type which +* like offsetof(), but takes a pointer to a variable of type which * contains @member, instead of a specified type. * @ptr is subject to multiple evaluation since we can't rely on __typeof__ * everywhere. git-cvsserver.perl +1
-1@@ -2149,7 +2149,7 @@ sub req_diff ( $meta2->{revision} or "workingcopy" )); # TODO: Use --label instead of -L because -L is no longer - # documented and may go away someday. Not sure if there there are + # documented and may go away someday. Not sure if there are # versions that only support -L, which would make this change risky? # http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html # ("man diff" should actually document the best migration strategy,remote.c +1
-1@@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,else /* * If the ref isn't stale, and is reachable -* from from one of the reflog entries of +* from one of the reflog entries of * the local branch, force the update. */ 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' ) ' -test_expect_success 'rename errors out early when when new name is invalid' ' +test_expect_success 'rename errors out early when new name is invalid' ' test_config remote.foo.vcs bar && echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect && 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' ' git svn fetch ) && rm -rf bare-repo ' -test_expect_success 'git-svn works in in a repository with a gitdir: link' ' +test_expect_success 'git-svn works in a repository with a gitdir: link' ' mkdir worktree gitdir && ( cd worktree && git svn init "$svnrepo" &&
Re: [PATCH v2] *: fix typos which duplicate a word
Quoted 15 lines · Junio C Hamano
Quoted 1 line · Andrei Rybak
Fix typos in documentation and code comments which repeat various words.
Thanks.
Quoted 6 lines
These typos were found by searching using scripts like this:
for w in $(grep '^....$' /usr/share/dict/words) do git grep -P "\b$w $w\b" doneThis is clarifying and somewhat puzzling at the same time.
Quoted 7 lines
It says that doubled words that span across line folding, and doubled words that do not have exactly a single space in between, have gone undetected (which is fine and may be useful information) by showing that it grepped for lines that has doubled words. But it also says that you only looked for four-letter words, which I do not believe is the case (you fixed "the the", for example), which is misleading. The "like this" part can be an excuse for that
Indeed. Basically, it was several scripts with different lists of words. I considered writing:
for w in <list of words>
do
git grep -P "\b$w $w\b"
done
but opted for an explicit example of a script used, which may be reused later.
Quoted 4 lines
inaccuracy, but then the whole thing pretty much has already been summarized nicely with your first line already, i.e. "which repeate various words". If you update it the end part of the sentence to "which repeat various words on the same line",
Since v2, I've written a script to also check sentences which span several lines. I'll send out a v3 with a bunch more fixes.
Quoted 5 lines
then the entire
paragaph can go without losing clarity.
Not a huge deal, though.The changes themselves all look good to me. Thanks. Will apply.
PATCH v3 1/1 *: fix typos which duplicate a word
In reply to Andrei RybakFix 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.
---
Thanks to Felipe Contreras and Junio C Hamano for review.
Changes since v2:
- reworded commit message
- new fixes in files:
- Documentation/RelNotes/1.6.0.3.txt
- Documentation/RelNotes/1.8.4.txt
- Documentation/RelNotes/2.29.0.txt
- Documentation/RelNotes/2.8.0.txt
- Documentation/technical/hash-function-transition.txt
- merge-recursive.c
Documentation/RelNotes/1.6.0.3.txt | 2 +- Documentation/RelNotes/1.8.4.txt | 2 +- Documentation/RelNotes/2.29.0.txt | 4 ++-- Documentation/RelNotes/2.8.0.txt | 2 +- Documentation/technical/hash-function-transition.txt | 2 +- Documentation/technical/protocol-v2.txt | 2 +- attr.c | 2 +- builtin/log.c | 3 +-- git-compat-util.h | 2 +- git-cvsserver.perl | 2 +- merge-recursive.c | 2 +- remote.c | 2 +- t/t5505-remote.sh | 2 +- t/t9100-git-svn-basic.sh | 2 +- 14 files changed, 15 insertions(+), 16 deletions(-)
Documentation/RelNotes/1.6.0.3.txt +1 -1
@@ -50,7 +50,7 @@ Fixes since v1.6.0.2 if the working tree is currently dirty. * "git for-each-ref --format=%(subject)" fixed for commits with no - no newline in the message body. + newline in the message body. * "git remote" fixed to protect printf from user input.
Documentation/RelNotes/1.8.4.txt +1 -1
@@ -365,7 +365,7 @@ details). (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint). * Invocations of "git checkout" used internally by "git rebase" were - counted as "checkout", and affected later "git checkout -" to the + counted as "checkout", and affected later "git checkout -" which took the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint).
Documentation/RelNotes/2.29.0.txt +2 -2
@@ -184,8 +184,8 @@ Performance, Internal Implementation, Development Support etc. the ref backend in use, as its format is much richer than the normal refs, and written directly by "git fetch" as a plain file.. - * An unused binary has been discarded, and and a bunch of commands - have been turned into into built-in. + * An unused binary has been discarded, and a bunch of commands + have been turned into built-in. * A handful of places in in-tree code still relied on being able to 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). on that order. * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a - rev, i.e. the object named by the the pathname with wildcard + rev, i.e. the object named by the pathname with wildcard characters in a tree object. (merge aac4fac nd/dwim-wildcards-as-pathspecs later to maint).
Documentation/technical/hash-function-transition.txt +1 -1
@@ -599,7 +599,7 @@ supports four different modes of operation: convert any object names written to output to SHA-1, but store objects using SHA-256. This allows users to test the code with no visible behavior change except for performance. This allows - allows running even tests that assume the SHA-1 hash function, to + running even tests that assume the SHA-1 hash function, to sanity-check the behavior of the new mode. 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: Indicates to the server an object which the client wants to obtain information for. -The response of `object-info` is a list of the the requested object ids +The response of `object-info` is a list of the requested object ids and associated requested information, each separated by a single space. output = info flush-pkt
attr.c +1 -1
@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)* Callers into the attribute system assume there is a single, system-wide * global state where attributes are read from and when the state is flipped by * calling git_attr_set_direction(), the stack frames that have been -* constructed need to be discarded so so that subsequent calls into the +* constructed need to be discarded so that subsequent calls into the * attribute system will lazily read from the right place. Since changing * direction causes a global paradigm shift, it should not ever be called while * 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) }else if (rev.diffopt.close_file) {/* * The diff code parsed --output; it has already opened the -* file, but but we must instruct it not to close after each -* diff. +* file, but we must instruct it not to close after each diff. */ rev.diffopt.no_free =1 ; }else {
git-compat-util.h +1 -1
@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) (type *)container_of_or_null_offset (ptr, offsetof(type , member))/* -* like offsetof(), but takes a pointer to a a variable of type which +* like offsetof(), but takes a pointer to a variable of type which * contains @member, instead of a specified type. * @ptr is subject to multiple evaluation since we can't rely on __typeof__ * everywhere.
git-cvsserver.perl +1 -1
@@ -2149,7 +2149,7 @@ sub req_diff ( $meta2->{revision} or "workingcopy" )); # TODO: Use --label instead of -L because -L is no longer - # documented and may go away someday. Not sure if there there are + # documented and may go away someday. Not sure if there are # versions that only support -L, which would make this change risky? # http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html # ("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,* implicit renaming of files that should be left in place. (See * testcase 6b in t6043 for details.) * 2. Prune directory renames if there are still files left in the -* the original directory. These represent a partial directory rename, +* original directory. These represent a partial directory rename, * i.e. a rename where only some of the files within the directory * were renamed elsewhere. (Technically, this could be done earlier * 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,else /* * If the ref isn't stale, and is reachable -* from from one of the reflog entries of +* from one of the reflog entries of * the local branch, force the update. */ 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' ) ' -test_expect_success 'rename errors out early when when new name is invalid' ' +test_expect_success 'rename errors out early when new name is invalid' ' test_config remote.foo.vcs bar && echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect && 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' ' git svn fetch ) && rm -rf bare-repo ' -test_expect_success 'git-svn works in in a repository with a gitdir: link' ' +test_expect_success 'git-svn works in a repository with a gitdir: link' ' mkdir worktree gitdir && ( cd worktree && git svn init "$svnrepo" &&
Signature · 1 line
2.31.1
Re: [PATCH v3] *: fix typos which duplicate a word
Quoted 4 lines · Andrei Rybak
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.txtfor it to make sense.
Thanks. I usually avoid touching published release notes (it is not like we'd issue 1.8.4.1 maintenance release to apply this typofix), but as you spent time to fix them all, and as we spent time to review the changes, let's take all of them.
Documentation/RelNotes/1.8.4.txt details). · line 370
Quoted 5 lines
* Invocations of "git checkout" used internally by "git rebase" were
Documentation/RelNotes/1.8.4.txt +1
-1- counted as "checkout", and affected later "git checkout -" to the + counted as "checkout", and affected later "git checkout -" which took the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint).
I think this one actually wanted to say "affected later X to take the user to an unexpected place", but ", which" is OK, too.
Thanks.