| Message ID | 20210625193851.2233114-4-rybak.a.v@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 98c7656a18b032b92180c945484a51a15502821d |
| Headers | show |
| Series | Config option names typofixes | expand |
not sure if this patch really belongs in this specific patchset, but it
might be worth also fixing the same typo in grep as shown by :
--- >8 ---
Subject: grep: fix worktree mis spelling
1d1729caeb (grep: replace grep_read_mutex by internal obj read lock,
2020-01-15) adds it as part of a comment
fix it to the right spelling without the extra trailing 'e'.
diff --git a/grep.c b/grep.c
index 8f91af1cb0..f40c734565 100644
--- a/grep.c
+++ b/grep.c
@@ -1510,7 +1510,7 @@ static int fill_textconv_grep(struct repository *r,
*
* TODO: allowing text conversion to run in parallel with object
* reading operations might increase performance in the multithreaded
- * non-worktreee git-grep with --textconv.
+ * non-worktree git-grep with --textconv.
*/
obj_read_lock();
size = fill_textconv(r, driver, df, &buf);
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
On 26/06/2021 08:58, Carlo Marcelo Arenas Belón wrote: > not sure if this patch really belongs in this specific patchset Yes, third patch is unrelated to the first two. >, but it > might be worth also fixing the same typo in grep as shown by : > > --- >8 --- > Subject: grep: fix worktree mis spelling s/mis spelling/misspelling/ > > 1d1729caeb (grep: replace grep_read_mutex by internal obj read lock, > 2020-01-15) adds it as part of a comment > > fix it to the right spelling without the extra trailing 'e'. > > diff --git a/grep.c b/grep.c > index 8f91af1cb0..f40c734565 100644 > --- a/grep.c > +++ b/grep.c > @@ -1510,7 +1510,7 @@ static int fill_textconv_grep(struct repository *r, > * > * TODO: allowing text conversion to run in parallel with object > * reading operations might increase performance in the multithreaded > - * non-worktreee git-grep with --textconv. > + * non-worktree git-grep with --textconv. I deliberately skipped this typo, because it is in a TODO comment, which I thought isn't worth fixing. I probably should have mentioned that in the patch I've sent. > */ > obj_read_lock(); > size = fill_textconv(r, driver, df, &buf); > > Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> >
Andrei Rybak <rybak.a.v@gmail.com> writes: > On 26/06/2021 08:58, Carlo Marcelo Arenas Belón wrote: >> not sure if this patch really belongs in this specific patchset > > Yes, third patch is unrelated to the first two. > >>, but it >> might be worth also fixing the same typo in grep as shown by : >> --- >8 --- >> Subject: grep: fix worktree mis spelling > > s/mis spelling/misspelling/ > >> 1d1729caeb (grep: replace grep_read_mutex by internal obj read lock, >> 2020-01-15) adds it as part of a comment >> fix it to the right spelling without the extra trailing 'e'. >> diff --git a/grep.c b/grep.c >> index 8f91af1cb0..f40c734565 100644 >> --- a/grep.c >> +++ b/grep.c >> @@ -1510,7 +1510,7 @@ static int fill_textconv_grep(struct repository *r, >> * >> * TODO: allowing text conversion to run in parallel with object >> * reading operations might increase performance in the multithreaded >> - * non-worktreee git-grep with --textconv. >> + * non-worktree git-grep with --textconv. > > I deliberately skipped this typo, because it is in a TODO comment, which > I thought isn't worth fixing. I probably should have mentioned that in > the patch I've sent. All sound sensible. Will queue these three patches as-is. Thanks.
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index f1bb1fa5f5..66e67e6cbf 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -387,7 +387,7 @@ These annotations are: ------------ $ git worktree list /path/to/linked-worktree abcd1234 [master] -/path/to/locked-worktreee acbd5678 (brancha) locked +/path/to/locked-worktree acbd5678 (brancha) locked /path/to/prunable-worktree 5678abc (detached HEAD) prunable ------------
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> --- Documentation/git-worktree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)