| Message ID | 20241017112835.10100-1-algonell@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | t: fix typos | expand |
On Thu, Oct 17, 2024 at 02:28:35PM +0300, Andrew Kreimer wrote: > Fix typos in documentation, comments, etc. > > Via codespell. > > Signed-off-by: Andrew Kreimer <algonell@gmail.com> > --- > Synced with: > - Merge branch 'la/trailer-info' into seen. Please do not base new topics on 'seen', as it is likely to change day-to-day. > @@ -117,7 +117,7 @@ do > git config extensions.objectformat $hash && > git config extensions.compatobjectformat $(compat_hash $hash) && > git config gpg.program $TEST_DIRECTORY/t1016/gpg && > - echo "Hellow World!" > hello && > + echo "Hello World!" > hello && Not the fault of this patch, but there is a style issue here that there should not be a space between '>' and 'hello' (i.e. it should read '>hello', not '> hello'). Likewise with the 'git config' use above should be test_config, etc. But this patch does not need to care about that, since it did not introduce those issues in the first place. The rest looks good, thanks. Thanks, Taylor
On Thu, Oct 17, 2024 at 04:23:05PM -0400, Taylor Blau wrote: > Please do not base new topics on 'seen', as it is likely to change > day-to-day. > Noted, thank you. > > @@ -117,7 +117,7 @@ do > > git config extensions.objectformat $hash && > > git config extensions.compatobjectformat $(compat_hash $hash) && > > git config gpg.program $TEST_DIRECTORY/t1016/gpg && > > - echo "Hellow World!" > hello && > > + echo "Hello World!" > hello && > > Not the fault of this patch, but there is a style issue here that there > should not be a space between '>' and 'hello' (i.e. it should read > '>hello', not '> hello'). > Do you mean that '> more' and '> another' should be handled similarly? > Likewise with the 'git config' use above should be test_config, etc. But > this patch does not need to care about that, since it did not introduce > those issues in the first place. > Will try to address this one.
On Fri, Oct 18, 2024, at 18:51, Andrew Kreimer wrote: > On Thu, Oct 17, 2024 at 04:23:05PM -0400, Taylor Blau wrote: >> Please do not base new topics on 'seen', as it is likely to change >> day-to-day. >> > > Noted, thank you. > >> > @@ -117,7 +117,7 @@ do >> > git config extensions.objectformat $hash && >> > git config extensions.compatobjectformat $(compat_hash $hash) && >> > git config gpg.program $TEST_DIRECTORY/t1016/gpg && >> > - echo "Hellow World!" > hello && >> > + echo "Hello World!" > hello && >> >> Not the fault of this patch, but there is a style issue here that there >> should not be a space between '>' and 'hello' (i.e. it should read >> '>hello', not '> hello'). >> > > Do you mean that '> more' and '> another' should be handled similarly? What do these two refer to? The code style says that redirection operators should have no space after them. See Documentation/CodingGuidelines at “Redirection operators”.
On Fri, Oct 18, 2024 at 06:58:48PM +0200, Kristoffer Haugsbakk wrote: > The code style says that redirection operators should have no space > after them. See Documentation/CodingGuidelines at “Redirection > operators”. > > -- > Kristoffer Haugsbakk Thanks for the clarification, will address this one as well.
On Fri, Oct 18, 2024 at 09:03:26PM +0300, Andrew Kreimer wrote: > On Fri, Oct 18, 2024 at 06:58:48PM +0200, Kristoffer Haugsbakk wrote: > > The code style says that redirection operators should have no space > > after them. See Documentation/CodingGuidelines at “Redirection > > operators”. > > > > -- > > Kristoffer Haugsbakk > > Thanks for the clarification, will address this one as well. Thanks, both. Kristoffer -- it's fine to do this in the same, or a separate patch in the new round. Thanks. Thanks, Taylor
On Fri, Oct 18, 2024 at 05:05:19PM -0400, Taylor Blau wrote: > On Fri, Oct 18, 2024 at 09:03:26PM +0300, Andrew Kreimer wrote: > > On Fri, Oct 18, 2024 at 06:58:48PM +0200, Kristoffer Haugsbakk wrote: > > > The code style says that redirection operators should have no space > > > after them. See Documentation/CodingGuidelines at “Redirection > > > operators”. > > > > > > -- > > > Kristoffer Haugsbakk > > > > Thanks for the clarification, will address this one as well. > > Thanks, both. Kristoffer -- it's fine to do this in the same, or a > separate patch in the new round. Thanks. Oops, I meant s/Kristoffer/Andrew/ here. Sorry about that. Thanks, Taylor
On Fri, Oct 18, 2024 at 05:06:26PM -0400, Taylor Blau wrote: > > > Thanks for the clarification, will address this one as well. > > > > Thanks, both. Kristoffer -- it's fine to do this in the same, or a > > separate patch in the new round. Thanks. > > Oops, I meant s/Kristoffer/Andrew/ here. Sorry about that. Wow. It must be time for me to close my laptop for the day ;-). Since this topic is already on 'next', please submit any new patches in a separate topic so I can queue them independently. Thanks. Thanks, Taylor
On Fri, Oct 18, 2024 at 05:41:22PM -0400, Taylor Blau wrote: > Since this topic is already on 'next', please submit any new patches in > a separate topic so I can queue them independently. Thanks. On it.
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 98b81e4d63..35c5c2b4f9 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -684,7 +684,7 @@ test_expect_success 'subtest: tests respect lazy prerequisites' ' write_and_run_sub_test_lib_test lazy-prereqs <<-\EOF && test_lazy_prereq LAZY_TRUE true - test_expect_success LAZY_TRUE "lazy prereq is satisifed" "true" + test_expect_success LAZY_TRUE "lazy prereq is satisfied" "true" test_expect_success !LAZY_TRUE "negative lazy prereq" "false" test_lazy_prereq LAZY_FALSE false @@ -695,7 +695,7 @@ test_expect_success 'subtest: tests respect lazy prerequisites' ' EOF check_sub_test_lib_test lazy-prereqs <<-\EOF - ok 1 - lazy prereq is satisifed + ok 1 - lazy prereq is satisfied ok 2 # skip negative lazy prereq (missing !LAZY_TRUE) ok 3 # skip lazy prereq not satisfied (missing LAZY_FALSE) ok 4 - negative false prereq diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index eeb2714d9d..9e6c6ee0d4 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -1116,11 +1116,11 @@ do test_delayed_checkout_progress test_terminal git checkout $opt ' - test_expect_success PERL "delayed checkout ommits progress on non-tty ($mode checkout)" ' + test_expect_success PERL "delayed checkout omits progress on non-tty ($mode checkout)" ' test_delayed_checkout_progress ! git checkout $opt ' - test_expect_success PERL,TTY "delayed checkout ommits progress with --quiet ($mode checkout)" ' + test_expect_success PERL,TTY "delayed checkout omits progress with --quiet ($mode checkout)" ' test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt ' diff --git a/t/t0212/parse_events.perl b/t/t0212/parse_events.perl index 30a9f51e9f..7146476c69 100644 --- a/t/t0212/parse_events.perl +++ b/t/t0212/parse_events.perl @@ -204,7 +204,7 @@ } # A series of potentially nested and threaded region and data events - # is fundamentally incompatibile with the type of summary record we + # is fundamentally incompatible with the type of summary record we # are building in this script. Since they are intended for # perf-trace-like analysis rather than a result summary, we ignore # most of them here. diff --git a/t/t0600-reffiles-backend.sh b/t/t0600-reffiles-backend.sh index 20df336cc3..bef2b70871 100755 --- a/t/t0600-reffiles-backend.sh +++ b/t/t0600-reffiles-backend.sh @@ -271,7 +271,7 @@ test_expect_success 'setup worktree' ' # Some refs (refs/bisect/*, pseudorefs) are kept per worktree, so they should # only appear in the for-each-reflog output if it is called from the correct # worktree, which is exercised in this test. This test is poorly written for -# mulitple reasons: 1) it creates invalidly formatted log entres. 2) it uses +# multiple reasons: 1) it creates invalidly formatted log entries. 2) it uses # direct FS access for creating the reflogs. 3) PSEUDO-WT and refs/bisect/random # do not create reflogs by default, so it is not testing a realistic scenario. test_expect_success 'for_each_reflog()' ' diff --git a/t/t1016-compatObjectFormat.sh b/t/t1016-compatObjectFormat.sh index be3206a16f..92024fe51d 100755 --- a/t/t1016-compatObjectFormat.sh +++ b/t/t1016-compatObjectFormat.sh @@ -117,7 +117,7 @@ do git config extensions.objectformat $hash && git config extensions.compatobjectformat $(compat_hash $hash) && git config gpg.program $TEST_DIRECTORY/t1016/gpg && - echo "Hellow World!" > hello && + echo "Hello World!" > hello && eval hello_${hash}_oid=$(git hash-object hello) && git update-index --add hello && git commit -m "Initial commit" && diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 3d44bd7643..2157f37da3 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -708,7 +708,7 @@ test_expect_success 'reset with wildcard pathspec' ' test_all_match git ls-files -s -- deep && # The following `git reset`s result in updating the index on files with - # `skip-worktree` enabled. To avoid failing due to discrepencies in reported + # `skip-worktree` enabled. To avoid failing due to discrepancies in reported # "modified" files, `test_sparse_match` reset is performed separately from # "full-checkout" reset, then the index contents of all repos are verified. @@ -824,7 +824,7 @@ test_expect_success 'update-index --remove outside sparse definition' ' # Reset the state test_all_match git reset --hard && - # --force-remove supercedes --ignore-skip-worktree-entries, removing + # --force-remove supersedes --ignore-skip-worktree-entries, removing # a skip-worktree file from the index (and disk) when both are specified # with --remove test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a && @@ -2081,7 +2081,7 @@ test_expect_success 'grep is not expanded' ' test_expect_failure 'grep within submodules is not expanded' ' init_repos_as_submodules && - # do not use ensure_not_expanded() here, becasue `grep` should be + # do not use ensure_not_expanded() here, because `grep` should be # run in the superproject, not in "./sparse-index" GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \ git grep --cached --recurse-submodules a -- "*/folder1/*" && diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index eb1691860d..bb057596f1 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -1838,10 +1838,10 @@ do test_expect_success "stdin $type create dangling symref ref works" ' test_when_finished "git symbolic-ref -d refs/heads/symref" && - format_command $type "symref-create refs/heads/symref" "refs/heads/unkown" >stdin && + format_command $type "symref-create refs/heads/symref" "refs/heads/unknown" >stdin && git update-ref --stdin $type --no-deref <stdin && git symbolic-ref refs/heads/symref >expect && - echo refs/heads/unkown >actual && + echo refs/heads/unknown >actual && test_cmp expect actual ' diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh index ef40511d89..a3464976e3 100755 --- a/t/t1506-rev-parse-diagnosis.sh +++ b/t/t1506-rev-parse-diagnosis.sh @@ -195,7 +195,7 @@ test_expect_success 'dotdot is not an empty set' ' ' test_expect_success 'dotdot does not peel endpoints' ' - git tag -a -m "annote" annotated HEAD && + git tag -a -m "annotate" annotated HEAD && A=$(git rev-parse annotated) && H=$(git rev-parse annotated^0) && { diff --git a/t/t2082-parallel-checkout-attributes.sh b/t/t2082-parallel-checkout-attributes.sh index aec55496eb..da06cafad7 100755 --- a/t/t2082-parallel-checkout-attributes.sh +++ b/t/t2082-parallel-checkout-attributes.sh @@ -91,7 +91,7 @@ test_expect_success 'parallel-checkout with eol conversions' ' # Entries that require an external filter are not eligible for parallel # checkout. Check that both the parallel-eligible and non-eligible entries are -# properly writen in a single checkout operation. +# properly written in a single checkout operation. # test_expect_success 'parallel-checkout and external filter' ' set_checkout_config 2 0 &&
Fix typos in documentation, comments, etc. Via codespell. Signed-off-by: Andrew Kreimer <algonell@gmail.com> --- Synced with: - Merge branch 'la/trailer-info' into seen. Tested: - ubuntu-latest, GitHub Actions. t/t0000-basic.sh | 4 ++-- t/t0021-conversion.sh | 4 ++-- t/t0212/parse_events.perl | 2 +- t/t0600-reffiles-backend.sh | 2 +- t/t1016-compatObjectFormat.sh | 2 +- t/t1092-sparse-checkout-compatibility.sh | 6 +++--- t/t1400-update-ref.sh | 4 ++-- t/t1506-rev-parse-diagnosis.sh | 2 +- t/t2082-parallel-checkout-attributes.sh | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-)