From 014c454799dbf281e634823c6134e8e95978df6f Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Sun, 31 May 2026 21:43:58 +0300 Subject: [PATCH] doc: fix typos via codespell There are some typos in the documentation, comments, etc. Fix them via codespell, and then adjust the "dump" files used by the subversion tests to match the updated contents. Signed-off-by: Andrew Kreimer [dscho noticed and fixed the problems in svn test] Signed-off-by: Johannes Schindelin [jc did final assembling of the three patches] Signed-off-by: Junio C Hamano --- Documentation/SubmittingPatches | 2 +- Documentation/git-sparse-checkout.adoc | 2 +- Documentation/technical/build-systems.adoc | 6 +- builtin/pack-objects.c | 2 +- commit-graph.h | 2 +- compat/precompose_utf8.c | 2 +- hook.h | 2 +- meson_options.txt | 2 +- midx-write.c | 2 +- odb/source.h | 2 +- packfile.h | 2 +- path.h | 2 +- reftable/system.h | 2 +- t/README | 2 +- t/chainlint.pl | 2 +- t/chainlint/chain-break-false.expect | 2 +- t/chainlint/chain-break-false.test | 2 +- t/t1700-split-index.sh | 2 +- t/t3909-stash-pathspec-file.sh | 6 +- t/t4052-stat-output.sh | 2 +- t/t4067-diff-partial-clone.sh | 2 +- t/t9150/svk-merge.dump | 20 +++---- t/t9151/svn-mergeinfo.dump | 66 +++++++++++----------- t/unit-tests/clar/README.md | 2 +- 24 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index d570184ec8..35b4952c8a 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -92,7 +92,7 @@ input and avoids unnecessary churn from many rapid iterations. topic are appropriate, so such an incremental updates are limited to small corrections and polishing. After a topic cooks for some time (like 7 calendar days) in 'next' without needing further tweaks on - top, it gets merged to the 'master' branch and wait to become part + top, it gets merged to the 'master' branch and waits to become part of the next major release. In the following sections, many techniques and conventions are listed diff --git a/Documentation/git-sparse-checkout.adoc b/Documentation/git-sparse-checkout.adoc index 0d1618f161..e286584c67 100644 --- a/Documentation/git-sparse-checkout.adoc +++ b/Documentation/git-sparse-checkout.adoc @@ -134,7 +134,7 @@ the `clean.requireForce` config option is set to `false`. + The `--dry-run` option will list the directories that would be removed without deleting them. Running in this mode can be helpful to predict the -behavior of the clean comand or to determine which kinds of files are left +behavior of the clean command or to determine which kinds of files are left in the sparse directories. + The `--verbose` option will list every file within the directories that diff --git a/Documentation/technical/build-systems.adoc b/Documentation/technical/build-systems.adoc index 3c5237b9fd..ca5b5d96f1 100644 --- a/Documentation/technical/build-systems.adoc +++ b/Documentation/technical/build-systems.adoc @@ -47,7 +47,7 @@ Auto-detection of the following items is considered to be important: - Check for the existence of headers. - Check for the existence of libraries. - - Check for the existence of exectuables. + - Check for the existence of executables. - Check for the runtime behavior of specific functions. - Check for specific link order requirements when multiple libraries are involved. @@ -106,7 +106,7 @@ by the build system: - C: the primary compiled language used by Git, must be supported. Relevant toolchains are GCC, Clang and MSVC. - - Rust: candidate as a second compiled lanugage, should be supported. Relevant + - Rust: candidate as a second compiled language, should be supported. Relevant toolchains is the LLVM-based rustc. Built-in support for the respective languages is preferred over support that @@ -142,7 +142,7 @@ The following list of build systems are considered: === GNU Make -- Platform support: ubitquitous on all platforms, but not well-integrated into Windows. +- Platform support: ubiquitous on all platforms, but not well-integrated into Windows. - Auto-detection: no built-in support for auto-detection of features. - Ease of use: easy to use, but discovering available options is hard. Makefile rules can quickly get out of hand once reaching a certain scope. diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index dd2480a73d..806068907e 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1341,7 +1341,7 @@ static void write_pack_file(void) * length of them as buffer length. * * Note that we need to subtract one though to - * accomodate for the sideband byte. + * accommodate for the sideband byte. */ struct hashfd_options opts = { .progress = progress_state, diff --git a/commit-graph.h b/commit-graph.h index f6a5433641..13ca4ff010 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -18,7 +18,7 @@ * This method is only used to enhance coverage of the commit-graph * feature in the test suite with the GIT_TEST_COMMIT_GRAPH and * GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS environment variables. Do not - * call this method oustide of a builtin, and only if you know what + * call this method outside of a builtin, and only if you know what * you are doing! */ void git_test_write_commit_graph_or_die(struct odb_source *source); diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c index 43b3be0114..6e709bd138 100644 --- a/compat/precompose_utf8.c +++ b/compat/precompose_utf8.c @@ -85,7 +85,7 @@ const char *precompose_string_if_needed(const char *in) out = reencode_string_iconv(in, inlen, ic_prec, 0, &outlen); if (out) { if (outlen == inlen && !memcmp(in, out, outlen)) - free(out); /* no need to return indentical */ + free(out); /* no need to return identical */ else in = out; } diff --git a/hook.h b/hook.h index 5c5628dd1f..5f0c3f19bb 100644 --- a/hook.h +++ b/hook.h @@ -116,7 +116,7 @@ struct run_hooks_opt { * While the callback allows piecemeal writing, it can also be * used for smaller inputs, where it gets called only once. * - * Add hook callback initalization context to `feed_pipe_ctx`. + * Add hook callback initialization context to `feed_pipe_ctx`. * Add hook callback internal state to `feed_pipe_cb_data`. * */ diff --git a/meson_options.txt b/meson_options.txt index 659cbb218f..1ed228d42a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -106,7 +106,7 @@ option('highlight_bin', type: 'string', value: 'highlight') # Documentation. option('docs', type: 'array', choices: ['man', 'html'], value: [], - description: 'Which documenattion formats to build and install.') + description: 'Which documentation formats to build and install.') option('default_help_format', type: 'combo', choices: ['man', 'html', 'platform'], value: 'platform', description: 'Default format used when executing git-help(1).') option('docs_backend', type: 'combo', choices: ['asciidoc', 'asciidoctor', 'auto'], value: 'auto', diff --git a/midx-write.c b/midx-write.c index a25cab75ab..5a97560436 100644 --- a/midx-write.c +++ b/midx-write.c @@ -1438,7 +1438,7 @@ static int write_midx_internal(struct write_midx_opts *opts) /* * Attempt opening the pack index to populate num_objects. - * Ignore failiures as they can be expected and are not + * Ignore failures as they can be expected and are not * fatal during this selection time. */ open_pack_index(oldest); diff --git a/odb/source.h b/odb/source.h index f706e0608a..4958a503cf 100644 --- a/odb/source.h +++ b/odb/source.h @@ -338,7 +338,7 @@ static inline int odb_source_read_object_stream(struct odb_read_stream **out, * are only iterated over once. * * The optional `request` structure serves as a template for retrieving the - * object info for each indvidual iterated object and will be populated as if + * object info for each individual iterated object and will be populated as if * `odb_source_read_object_info()` was called on the object. It will not be * modified, the callback will instead be invoked with a separate `struct * object_info` for every object. Object info will not be read when passing a diff --git a/packfile.h b/packfile.h index 9b647da7dd..6dea707ba4 100644 --- a/packfile.h +++ b/packfile.h @@ -124,7 +124,7 @@ struct packfile_store { * that packs that contain a lot of accessed objects will be located * towards the front. * - * This is usually desireable, but there are exceptions. One exception + * This is usually desirable, but there are exceptions. One exception * is when the looking up multiple objects in a loop for each packfile. * In that case, we may easily end up with an infinite loop as the * packfiles get reordered to the front repeatedly. diff --git a/path.h b/path.h index 0434ba5e07..4c2958a903 100644 --- a/path.h +++ b/path.h @@ -217,7 +217,7 @@ void safe_create_dir(struct repository *repo, const char *dir, int share); * * - It always adjusts shared permissions. * - * Returns a negative erorr code on error, 0 on success. + * Returns a negative error code on error, 0 on success. */ int safe_create_dir_in_gitdir(struct repository *repo, const char *path); diff --git a/reftable/system.h b/reftable/system.h index c0e2cbe0ff..628232a46f 100644 --- a/reftable/system.h +++ b/reftable/system.h @@ -84,7 +84,7 @@ struct reftable_flock { * to acquire the lock. If `timeout_ms` is 0 we don't wait, if it is negative * we block indefinitely. * - * Retrun 0 on success, a reftable error code on error. Specifically, + * Return 0 on success, a reftable error code on error. Specifically, * `REFTABLE_LOCK_ERROR` should be returned in case the target path is already * locked. */ diff --git a/t/README b/t/README index adbbd9acf4..085921be4b 100644 --- a/t/README +++ b/t/README @@ -972,7 +972,7 @@ see test-lib-functions.sh for the full list and their options. - test_lazy_prereq