[PATCH 0/5] Fix typos

[PATCH 0/5] Fix typos

[Andrew Kreimer]

Fix typos in documentation, comments, etc.

 gitk-git/gitk      | 2 +-
 mergetools/vimdiff | 2 +-
 perl/Git/I18N.pm   | 2 +-
 reftable/reader.h  | 2 +-
 trace2/tr2_ctr.c   | 2 +-
 trace2/tr2_tls.h   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.39.5

[PATCH 1/5] trace2: fix typos

[Andrew Kreimer]

Fix typos in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 trace2/tr2_ctr.c | 2 +-
 trace2/tr2_tls.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/trace2/tr2_ctr.c b/trace2/tr2_ctr.c
index 036b643578..ee17bfa86b 100644
--- a/trace2/tr2_ctr.c
+++ b/trace2/tr2_ctr.c
@@ -4,7 +4,7 @@
 #include "trace2/tr2_ctr.h"
 
 /*
- * A global counter block to aggregrate values from the partial sums
+ * A global counter block to aggregate values from the partial sums
  * from each thread.
  */
 static struct tr2_counter_block final_counter_block; /* access under tr2tls_mutex */
diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h
index 3dfe6557fc..3bdbf4d275 100644
--- a/trace2/tr2_tls.h
+++ b/trace2/tr2_tls.h
@@ -11,7 +11,7 @@
  */
 
 /*
- * Arbitry limit for thread names for column alignment.
+ * Arbitrary limit for thread names for column alignment.
  */
 #define TR2_MAX_THREAD_NAME (24)
 
-- 
2.39.5

[PATCH 2/5] reftable: fix a typo

[Andrew Kreimer]

Fix a typo in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 reftable/reader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reftable/reader.h b/reftable/reader.h
index 3710ee09b4..91377b9ce5 100644
--- a/reftable/reader.h
+++ b/reftable/reader.h
@@ -30,7 +30,7 @@ struct reftable_reader_offsets {
 
 /* The state for reading a reftable file. */
 struct reftable_reader {
-	/* for convience, associate a name with the instance. */
+	/* for convenience, associate a name with the instance. */
 	char *name;
 	struct reftable_block_source source;
 
-- 
2.39.5

[PATCH 3/5] mergetool: fix a typo

[Andrew Kreimer]

Fix a typo in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 mergetools/vimdiff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index f8ad6b35d4..ffc9be86c8 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -411,7 +411,7 @@ merge_cmd () {
 			-f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"'
 	else
 		# If there is no BASE (example: a merge conflict in a new file
-		# with the same name created in both braches which didn't exist
+		# with the same name created in both branches which didn't exist
 		# before), close all BASE windows using vim's "quit" command
 
 		FINAL_CMD=$(echo "$FINAL_CMD" | \
-- 
2.39.5

[PATCH 4/5] gitk: fix a typo

[Andrew Kreimer]

Fix a typo in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 gitk-git/gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 7a087f123d..f85c421c5f 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -3687,7 +3687,7 @@ proc external_diff {} {
         set diffidto [lindex $diffids 1]
     }
 
-    # make sure that several diffs wont collide
+    # make sure that several diffs won't collide
     set diffdir [gitknewtmpdir]
     if {$diffdir eq {}} return
 
-- 
2.39.5

[PATCH 5/5] perl: fix a typo

[Andrew Kreimer]

Fix a typo in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 perl/Git/I18N.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index 5454c3a6d2..475e90a6df 100644
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -111,7 +111,7 @@ =head2 __n($$$)
 =head2 N__($)
 
 No-operation that only returns its argument. Use this if you want xgettext to
-extract the text to the pot template but do not want to trigger retrival of the
+extract the text to the pot template but do not want to trigger retrieval of the
 translation at run time.
 
 =head1 AUTHOR
-- 
2.39.5

Re: [PATCH 0/5] Fix typos

[Eric Sunshine]

On Wed, Oct 2, 2024 at 6:38 PM Andrew Kreimer <algonell@gmail.com> wrote:
> Fix typos in documentation, comments, etc.
>
>  gitk-git/gitk      | 2 +-
>  mergetools/vimdiff | 2 +-
>  perl/Git/I18N.pm   | 2 +-
>  reftable/reader.h  | 2 +-
>  trace2/tr2_ctr.c   | 2 +-
>  trace2/tr2_tls.h   | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)

Thanks. These fixes all look fine.

The gitk fix, though, may need to be sent separately since gitk is
maintained as a separate project which Junio periodically pulls into
Git. (Unfortunately, however, the gitk maintainer has gone missing,
so...)

Re: [PATCH 0/5] Fix typos

[Andrew Kreimer]

On Wed, Oct 02, 2024 at 06:49:06PM -0400, Eric Sunshine wrote:
> On Wed, Oct 2, 2024 at 6:38 PM Andrew Kreimer <algonell@gmail.com> wrote:
> > Fix typos in documentation, comments, etc.
> >
> >  gitk-git/gitk      | 2 +-
> >  mergetools/vimdiff | 2 +-
> >  perl/Git/I18N.pm   | 2 +-
> >  reftable/reader.h  | 2 +-
> >  trace2/tr2_ctr.c   | 2 +-
> >  trace2/tr2_tls.h   | 2 +-
> >  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> The gitk fix, though, may need to be sent separately since gitk is
> maintained as a separate project which Junio periodically pulls into
> Git. (Unfortunately, however, the gitk maintainer has gone missing,
> so...)

Thank you.