doc: fix typos via codespell
Subsystems (2)
PATCH 1/1 doc: fix typos via codespell
There are some typos in the documentation, comments, etc. Fix them via codespell.
--- 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 +- git-gui/git-gui.sh | 2 +- git-gui/lib/choose_repository.tcl | 2 +- git-gui/lib/themed.tcl | 2 +- hook.h | 2 +- meson_options.txt | 2 +- midx-write.c | 4 ++-- odb/source.h | 2 +- packfile.h | 2 +- path.h | 2 +- po/el.po | 2 +- po/ko.po | 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 | 10 +++++----- t/t9151/svn-mergeinfo.dump | 18 +++++++++--------- t/unit-tests/clar/README.md | 2 +- 29 files changed, 46 insertions(+), 46 deletions(-)
Documentation/SubmittingPatches +1 -1
@@ -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
Documentation/git-sparse-checkout.adoc +1 -1
@@ -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
Documentation/technical/build-systems.adoc +3 -3
@@ -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.
builtin/pack-objects.c +1 -1
@@ -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,
commit-graph.h +1 -1
@@ -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);
compat/precompose_utf8.c +1 -1
@@ -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; }
git-gui/git-gui.sh +1 -1
@@ -109,7 +109,7 @@ foreach p [split $env(PATH) $_path_sep] { if {[file pathtype $p] ne {absolute}} { continue } - # Keep only the first occurence of any duplicates. + # Keep only the first occurrence of any duplicates. set norm_p [file normalize $p] dict set _path_seen $norm_p 1 }
git-gui/lib/choose_repository.tcl +1 -1
@@ -15,7 +15,7 @@ field w_recentlist ; # Listbox containing recent repositories field w_localpath ; # Entry widget bound to local_path field done 0 ; # Finished picking the repository? -field clone_ok false ; # clone succeeeded +field clone_ok false ; # clone succeeded field local_path {} ; # Where this repository is locally field origin_url {} ; # Where we are cloning from field origin_name origin ; # What we shall call 'origin'
git-gui/lib/themed.tcl +1 -1
@@ -4,7 +4,7 @@ namespace eval color { # Variable colors - # Preffered way to set widget colors is using add_option. + # Preferred way to set widget colors is using add_option. # In some cases, like with tags in_diff/in_sel, we use these colors. variable select_bg lightgray variable select_fg black
hook.h +1 -1
@@ -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`. * */
meson_options.txt +1 -1
@@ -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',
midx-write.c +2 -2
@@ -1152,7 +1152,7 @@ static bool midx_needs_update(struct multi_pack_index *midx, struct write_midx_c/* * Ensure that we have a valid checksum before consulting the -* exisiting MIDX in order to determine if we can avoid an +* existing MIDX in order to determine if we can avoid an * update. * * This is necessary because the given MIDX is loaded directly
@@ -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);
odb/source.h +1 -1
@@ -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
packfile.h +1 -1
@@ -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.
path.h +1 -1
@@ -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);
po/el.po +1 -1
@@ -2748,7 +2748,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Εντολές Χαμηλού Επιπέδου / Ερωτημάτων" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Εντολές Χαμηλού Επιπέδου / Συγχρονισμού Αποθετηρίων" #: help.c:38
po/ko.po +1 -1
@@ -2062,7 +2062,7 @@ msgid "Low-level Commands / Interrogators" msgstr "보조 명령 / 정보 획득 기능" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "보조 명령 / 저장소 동기화 기능" #: help.c:38
reftable/system.h +1 -1
@@ -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. */
t/README +1 -1
@@ -972,7 +972,7 @@ see test-lib-functions.sh for the full list and their options. - test_lazy_prereq <prereq> <script> Declare the way to determine if a test prerequisite <prereq> is - satisified or not, but delay the actual determination until the + satisfied or not, but delay the actual determination until the prerequisite is actually used by "test_have_prereq" or the three-arg form of the test_expect_* functions. For example, this is how the SYMLINKS prerequisite is declared to see if the platform
t/chainlint.pl +1 -1
@@ -35,7 +35,7 @@ # # In other languages, `1+2` would typically be scanned as three tokens # (`1`, `+`, and `2`), but in shell it is a single token. However, the similar -# `1 + 2`, which embeds whitepace, is scanned as three token in shell, as well. +# `1 + 2`, which embeds whitespace, is scanned as three token in shell, as well. # In shell, several characters with special meaning lose that meaning when not # surrounded by whitespace. For instance, the negation operator `!` is special # when standing alone surrounded by whitespace; whereas in `foo!uucp` it is
t/chainlint/chain-break-false.expect +1 -1
@@ -1,4 +1,4 @@ -2 if condition not satisified +2 if condition not satisfied 3 then 4 echo it did not work... 5 echo failed!
t/chainlint/chain-break-false.test +1 -1
@@ -1,6 +1,6 @@ test_expect_success 'chain-break-false' ' # LINT: broken &&-chain okay if explicit "false" signals failure -if condition not satisified +if condition not satisfied then echo it did not work... echo failed!
t/t1700-split-index.sh +1 -1
@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' ' git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we wont catch the problem + # must not write a new shareindex, or we won't catch the problem git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err && # i.e. do not expect warnings like # could not freshen shared index .../shareindex.00000...
t/t3909-stash-pathspec-file.sh +3 -3
@@ -29,7 +29,7 @@ verify_expect () { test_expect_success 'simplest' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
@@ -47,7 +47,7 @@ test_expect_success 'simplest' ' test_expect_success '--pathspec-file-nul' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
@@ -66,7 +66,7 @@ test_expect_success '--pathspec-file-nul' ' test_expect_success 'only touches what was listed' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
t/t4052-stat-output.sh +1 -1
@@ -420,7 +420,7 @@ test_expect_success 'merge --stat respects COLUMNS with long name' ' # enough terminal display width, will contain the following line: # "<RED>|<RESET> ${FILENAME} | 0" # where "<RED>" and "<RESET>" are ANSI escape codes to color the text. -# To calculate the minimium terminal display width MIN_TERM_WIDTH so that the +# To calculate the minimum terminal display width MIN_TERM_WIDTH so that the # FILENAME in the diffstat will not be shortened, we take the FILENAME length # and add 9 to it. # To check if the diffstat width, when the line_prefix (the "<RED>|<RESET>" of
t/t4067-diff-partial-clone.sh +1 -1
@@ -159,7 +159,7 @@ test_expect_success 'diff succeeds even if prefetch triggered by break-rewrites' # We need baz to trigger break-rewrites detection. git -C client reset --hard HEAD && - # break-rewrites detction in reset. + # break-rewrites detection in reset. git -C client reset HEAD~1 '
t/t9150/svk-merge.dump +5 -5
@@ -77,7 +77,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -206,7 +206,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -310,7 +310,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -417,7 +417,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -534,7 +534,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
t/t9151/svn-mergeinfo.dump +9 -9
@@ -87,7 +87,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -260,7 +260,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -365,7 +365,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -473,7 +473,7 @@ Content-length: 2529 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -578,7 +578,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -767,7 +767,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -948,7 +948,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -1172,7 +1172,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -1414,7 +1414,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
t/unit-tests/clar/README.md +1 -1
@@ -138,7 +138,7 @@ raise errors during test execution. __Caution:__ If you use assertions inside of `test_suitename__initialize`, make sure that you do not rely on `__initialize` being completely run inside your `test_suitename__cleanup` function. Otherwise you might -encounter ressource cleanup twice. +encounter resource cleanup twice. ## How does Clar work?
Signature · 1 line
2.54.0
Documentation/SubmittingPatches input and avoids unnecessary churn from many rapid i[INFO ] 2026-05-06 12:13:18.452 [restartedMain] [userId:] c.n.a.DatabaseMigrator - Created measure package with name “Scoring MP w/ content package feedback (NIUP-470)” and key “norse-mp-12”
Quoted 11 lines · Andrew Kreimer
There are some typos in the documentation, comments, etc. Fix them via codespell.
Signed-off-by Andrew Kreimer <[email protected]>---
[snip]Documentation/SubmittingPatches +0
-0@@ -92,7 +92,7 @@ input and avoids unnecessary churn from many rapid i[INFO ] 2026-05-06 12:13:18.452 [restartedMain] [userId:] c.n.a.DatabaseMigrator - Created measure package with name “Scoring MP w/ content package feedback (NIUP-470)” and key “norse-mp-12”
[INFO ] 2026-05-06 12:13:18.620 [restartedMain] [userId:] c.n.a.DatabaseMigrator - Created measure package with name “Scoring MP w/ charts (NIUP-470)” and key “norse-mp-13”terations.
Documentation/SubmittingPatches input and avoids unnecessary churn from many rapid iterations. · line 95
Quoted 5 lines
Documentation/SubmittingPatches +1
-1topic 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
“It ... waits” (verb agreement). Okay.
Quoted 13 lines
Documentation/SubmittingPatches +0
-0of the next major release. In the following sections, many techniques and conventions are listedDocumentation/git-sparse-checkout.adoc +0
-0@@ -134,7 +134,7 @@ the `clean.requireForce` config option is set to
false.
+
The--dry-runoption will list the directories that would be removed without deleting them. Running in this mode can be helpful to predict the
Documentation/git-sparse-checkout.adoc the `clean.requireForce` config option is set to `false`. · line 137
Quoted 2 lines
Documentation/git-sparse-checkout.adoc +1
-1-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
“command” typo.
Quoted 13 lines
in the sparse directories.
+
The--verboseoption will list every file within the directories thatDocumentation/technical/build-systems.adoc +0
-0@@ -47,7 +47,7 @@ Auto-detection of the following items is consideredto be important:
- Check for the existence of headers.
- Check for the existence of libraries.
Documentation/technical/build-systems.adoc Auto-detection of the following items is considered to be important: · line 50
Quoted 2 lines
Documentation/technical/build-systems.adoc +1
-1- - Check for the existence of exectuables. + - Check for the existence of executables.
“executables” typo.
Quoted 11 lines
- Check for the runtime behavior of specific functions.
- Check for specific link order requirements when multiple libraries are involved.Documentation/technical/build-systems.adoc +0
-0@@ -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
“language” typo.
Documentation/technical/build-systems.adoc The following list of build systems are considered: · line 145
Quoted 10 lines
supported. Relevant
toolchains is the LLVM-based rustc.Built-in support for the respective languages is preferred over support that
Documentation/technical/build-systems.adoc +1
-1@@ -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.
“ubiquitous” typo. (that’s a difficult word for me)
Quoted 9 lines
Documentation/technical/build-systems.adoc +0
-0- 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.builtin/pack-objects.c +0
-0
builtin/pack-objects.c static void write_pack_file(void) · line 1344
Quoted 5 lines
builtin/pack-objects.c +1
-1@@ -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.
“accommodate” typo.
commit-graph.h line 21
Quoted 13 lines
builtin/pack-objects.c +0
-0*/ struct hashfd_options opts = { .progress = progress_state,commit-graph.h +1
-1@@ -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
“outside” typo.
Quoted 8 lines
commit-graph.h +0
-0* you are doing! */ void git_test_write_commit_graph_or_die (struct odb_source *source);compat/precompose_utf8.c +0
-0
compat/precompose_utf8.c const char *precompose_string_if_needed(const char · line 89
Quoted 6 lines
compat/precompose_utf8.c +1
-1@@ -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 */
“identical” typo.
git-gui/git-gui.sh foreach p [split $env(PATH) $_path_sep] { · line 112
Quoted 13 lines
compat/precompose_utf8.c +0
-0else in = out;compat/precompose_utf8.c +0
-0}git-gui/git-gui.sh +1
-1@@ -109,7 +109,7 @@ foreach p [split $env(PATH) $_path_sep] { if {[file pathtype $p] ne {absolute}} { continue } - # Keep only the first occurence of any duplicates. + # Keep only the first occurrence of any duplicates.
“occurrence” typo.
Quoted 13 lines
git-gui/git-gui.sh +0
-0set norm_p [file normalize $p] dict set _path_seen $norm_p 1 }git-gui/lib/choose_repository.tcl +0
-0@@ -15,7 +15,7 @@ field w_recentlist ; # Listbox containing recentrepositories
fieldw_localpath; # Entry widget bound tolocal_pathfield done 0 ; # Finished picking the repository?
git-gui/lib/choose_repository.tcl field w_recentlist ; # Listbox containing recent repositories · line 18
Quoted 2 lines
git-gui/lib/choose_repository.tcl +1
-1-field clone_ok false ; # clone succeeeded +field clone_ok false ; # clone succeeded
“succeeded” typo.
git-gui/lib/themed.tcl line 7
Quoted 13 lines
field
local_path{} ; # Where this repository is locally
fieldorigin_url{} ; # Where we are cloning from
fieldorigin_nameorigin ; # What we shall call 'origin'git-gui/lib/themed.tcl +1
-1@@ -4,7 +4,7 @@ namespace eval color { # Variable colors - # Preffered way to set widget colors is using add_option. + # Preferred way to set widget colors is using add_option.
“Preferred” typo.
hook.h struct run_hooks_opt { · line 119
Quoted 13 lines
git-gui/lib/themed.tcl +0
-0# In some cases, like with tags in_diff/in_sel, we use these colors. variable select_bg lightgray variable select_fg blackhook.h +1
-1@@ -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`.
“initialization” typo.
meson_options.txt option('highlight_bin', type: 'string', value: 'highlight') · line 109
Quoted 13 lines
hook.h +0
-0* Add hook callback internal state to `feed_pipe_cb_data`. * */ meson_options.txt +1
-1@@ -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.')
“documentation” typo. Took me five seconds to stop.
Quoted 12 lines
meson_options.txt +0
-0option('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',midx-write.c +0
-0@@ -1152,7 +1152,7 @@ static bool midx_needs_update(struct
multi_pack_index*midx, structwrite_midx_c
midx-write.c static bool midx_needs_update(struct multi_pack_index *midx, struct write_midx_c · line 1155
Quoted 4 lines
midx-write.c +1
-1/* * Ensure that we have a valid checksum before consulting the -* exisiting MIDX in order to determine if we can avoid an +* existing MIDX in order to determine if we can avoid an
“existing” typo.
midx-write.c static int write_midx_internal(struct · line 1442
Quoted 10 lines
midx-write.c +1
-1* update. * * This is necessary because the given MIDX is loaded directly @@ -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
“failures” typo.
Quoted 12 lines
midx-write.c +0
-0* fatal during this selection time. */ midx-write.c +0
-0open_pack_index (oldest);odb/source.h +0
-0@@ -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
Quoted 3 lines
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
“individual” typo.
Quoted 11 lines
*
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 apackfile.h +0
-0
packfile.h struct packfile_store { · line 127
Quoted 5 lines
packfile.h +1
-1@@ -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
“desirable” typo.
Quoted 9 lines
packfile.h +0
-0* is when the looking up multiple objects in a loop for each packfile.
packfile.h +0
-0* In that case, we may easily end up with an infinite loop as the * packfiles get reordered to the front repeatedly. path.h +0
-0
path.h void safe_create_dir(struct repository *repo, const · line 221
Quoted 6 lines
path.h +1
-1@@ -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.
“error” typo.
Quoted 4 lines
path.h +0
-0*/ int safe_create_dir_in_gitdir(struct repository *repo, const char*path);
These next ones are for translations:
Quoted 18 lines
po/el.po +1
-1@@ -2748,7 +2748,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Εντολές Χαμηλού Επιπέδου / Ερωτημάτων" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Εντολές Χαμηλού Επιπέδου / Συγχρονισμού Αποθετηρίων" #: help.c:38po/ko.po +0
-0
po/ko.po msgid "Low-level Commands / Interrogators" · line 2066
Quoted 6 lines
po/ko.po +1
-1@@ -2062,7 +2062,7 @@ msgid "Low-level Commands / Interrogators" msgstr "보조 명령 / 정보 획득 기능" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "보조 명령 / 저장소 동기화 기능"
Translation msgids for locales el and ko are wrong. Should these be dealt with here or separately? Translations (/po) is its own subsystem.
Quoted 8 lines
po/ko.po +0
-0#: help.c:38reftable/system.h +0
-0@@ -84,7 +84,7 @@ struct reftable_flock {* to acquire the lock. If `timeout_ms` is 0 we don't wait, if it is
Quoted 5 lines
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,
“Return”. Took me four seconds to spot.
Quoted 13 lines
*
REFTABLE_LOCK_ERRORshould be returned in case the target path is
already
* locked.
*/t/README +0
-0@@ -972,7 +972,7 @@ see test-lib-functions.sh for the full list andtheir options.
-test_lazy_prereq<prereq> <script>Declare the way to determine if a test prerequisite <prereq> is
t/README see test-lib-functions.sh for the full list and their options. · line 975
Quoted 2 lines
t/README +1
-1- satisified or not, but delay the actual determination until the + satisfied or not, but delay the actual determination until the
“satisfied” typo.
t/chainlint.pl line 38
Quoted 13 lines
prerequisite is actually used by "
test_have_prereq" or the three-arg form of the test_expect_* functions. For example, this is how the SYMLINKS prerequisite is declared to see if the platformt/chainlint.pl +1
-1@@ -35,7 +35,7 @@ # # In other languages, `1+2` would typically be scanned as three tokens # (`1`, `+`, and `2`), but in shell it is a single token. However, the similar -# `1 + 2`, which embeds whitepace, is scanned as three token in shell, as well. +# `1 + 2`, which embeds whitespace, is scanned as three token in shell, as well.
“whitespace” typo.
Quoted 23 lines
t/chainlint.pl +0
-0# In shell, several characters with special meaning lose that meaningwhen not
# surrounded by whitespace. For instance, the negation operator `!` is special # when standing alone surrounded by whitespace; whereas in `foo!uucp` it ist/chainlint/chain-break-false.expect +1
-1@@ -1,4 +1,4 @@ -2 if condition not satisified +2 if condition not satisfied 3 then 4 echo it did not work... 5 echo failed!t/chainlint/chain-break-false.test +0
-0
t/chainlint/chain-break-false.test line 3
Quoted 4 lines
t/chainlint/chain-break-false.test +1
-1@@ -1,6 +1,6 @@ test_expect_success 'chain-break-false' ' # LINT: broken &&-chain okay if explicit "false" signals failure -if condition not satisified +if condition not satisfied
“satisfied” typo. The “satisified” with the extra “i” seems easy to make.
Quoted 9 lines
t/chainlint/chain-break-false.test +0
-0then echo it did not work... echo failed!t/t1700-split-index.sh +0
-0@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null baseindex' '
t/t1700-split-index.sh test_expect_success 'do not refresh null base index' ' · line 505
Quoted 5 lines
t/t1700-split-index.sh +1
-1git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we wont catch the problem + # must not write a new shareindex, or we won't catch the problem
Lack of contraction typo.
Quoted 10 lines
git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch
2>err &&t/t1700-split-index.sh +0
-0# i.e. do not expect warnings like # could not freshen shared index .../shareindex.00000...t/t3909-stash-pathspec-file.sh +0
-0
t/t3909-stash-pathspec-file.sh verify_expect () { · line 32
Quoted 5 lines
t/t3909-stash-pathspec-file.sh +1
-1@@ -29,7 +29,7 @@ verify_expect () { test_expect_success 'simplest' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore
Ditto.
t/t3909-stash-pathspec-file.sh test_expect_success 'simplest' ' · line 50
Quoted 9 lines
t/t3909-stash-pathspec-file.sh +1
-1# --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&@@ -47,7 +47,7 @@ test_expect_success 'simplest' ' test_expect_success '--pathspec-file-nul' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore
Again.
t/t3909-stash-pathspec-file.sh test_expect_success '--pathspec-file-nul' ' · line 69
Quoted 9 lines
t/t3909-stash-pathspec-file.sh +1
-1# --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&@@ -66,7 +66,7 @@ test_expect_success '--pathspec-file-nul' ' test_expect_success 'only touches what was listed' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore
Again.
Quoted 12 lines
t/t3909-stash-pathspec-file.sh +0
-0# --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&t/t4052-stat-output.sh +0
-0@@ -420,7 +420,7 @@ test_expect_success 'merge --stat respects COLUMNSwith long name' '
# enough terminal display width, will contain the following line: # "<RED>|<RESET> ${FILENAME} | 0" # where "<RED>" and "<RESET>" are ANSI escape codes to color the text.
t/t4052-stat-output.sh test_expect_success 'merge --stat respects COLUMNS with long name' ' · line 423
Quoted 2 lines
t/t4052-stat-output.sh +1
-1-# To calculate the minimium terminal display width MIN_TERM_WIDTH so that the +# To calculate the minimum terminal display width MIN_TERM_WIDTH so that the
“minimum” typo.
Quoted 12 lines
# FILENAME in the diffstat will not be shortened, we take the FILENAME
length# and add 9 to it. # To check if the diffstat width, when the line_prefix (the "<RED>|<RESET>" oft/t4067-diff-partial-clone.sh +0
-0@@ -159,7 +159,7 @@ test_expect_success 'diff succeeds even if prefetchtriggered by break-rewrites'
t/t4067-diff-partial-clone.sh test_expect_success 'diff succeeds even if prefetch triggered by break-rewrites' · line 162
Quoted 5 lines
t/t4067-diff-partial-clone.sh +1
-1# We need baz to trigger break-rewrites detection. git -C client reset --hard HEAD && - # break-rewrites detction in reset. + # break-rewrites detection in reset.
“detection” typo.
t/t9150/svk-merge.dump Content-length: 2411 · line 80
Quoted 13 lines
t/t4067-diff-partial-clone.sh +0
-0git -C client reset HEAD~1 't/t9150/svk-merge.dump +1
-1@@ -77,7 +77,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
“happening”. This took me a minute to spot.
t/t9150/svk-merge.dump Content-length: 2465 · line 209
Quoted 9 lines
t/t9150/svk-merge.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -206,7 +206,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9150/svk-merge.dump Content-length: 2521 · line 313
Quoted 9 lines
t/t9150/svk-merge.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -310,7 +310,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9150/svk-merge.dump Content-length: 2593 · line 420
Quoted 9 lines
t/t9150/svk-merge.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -417,7 +417,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9150/svk-merge.dump Content-length: 2713 · line 537
Quoted 9 lines
t/t9150/svk-merge.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -534,7 +534,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2411 · line 90
Quoted 13 lines
t/t9150/svk-merge.dump +0
-0# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it willt/t9151/svn-mergeinfo.dump +1
-1@@ -87,7 +87,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2465 · line 263
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -260,7 +260,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2521 · line 368
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -365,7 +365,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2529 · line 476
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -473,7 +473,7 @@ Content-length: 2529 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2593 · line 581
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -578,7 +578,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2593 · line 770
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -767,7 +767,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2713 · line 951
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -948,7 +948,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2713 · line 1175
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -1172,7 +1172,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/t9151/svn-mergeinfo.dump Content-length: 2713 · line 1417
Quoted 9 lines
t/t9151/svn-mergeinfo.dump +1
-1# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -1414,7 +1414,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening.
Same.
t/unit-tests/clar/README.md raise errors during test execution. · line 141
Quoted 13 lines
t/t9151/svn-mergeinfo.dump +0
-0# # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it willt/unit-tests/clar/README.md +1
-1@@ -138,7 +138,7 @@ raise errors during test execution. __Caution:__ If you use assertions inside of `test_suitename__initialize`, make sure that you do not rely on `__initialize` being completely run inside your `test_suitename__cleanup` function. Otherwise you might -encounter ressource cleanup twice. +encounter resource cleanup twice.
“resource” typo.
Quoted 5 lines
t/unit-tests/clar/README.md +0
-1## How does Clar work? --2.54.0
Quoted 5 lines · Andrew Kreimer
There are some typos in the documentation, comments, etc. Fix them via codespell.
Signed-off-by Andrew Kreimer <[email protected]>---
A few observations.
* It is a bit too much to be in a single patch to review.
* The fixes would apply to different vintages of the codebase. especially the files in git-gui/ and po/ come from trees maintained differently and patches to them need to be separate.
The spellos in *.po files stem from 96c0caf5 (Fix spelling errors in messages shown to users, 2019-11-05) and .po files for other languages have been updated to match the updated text in the code since then, but not these two languages---if they are not maintained since 2019, we need to wonder if they are worth keeping.
Quoted 9 lines
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 +- git-gui/git-gui.sh | 2 +- git-gui/lib/choose_repository.tcl | 2 +- git-gui/lib/themed.tcl | 2 +-
Quoted 8 lines
hook.h | 2 +- meson_options.txt | 2 +- midx-write.c | 4 ++-- odb/source.h | 2 +- packfile.h | 2 +- path.h | 2 +- po/el.po | 2 +- po/ko.po | 2 +-
I've read through the patch to above files before I ran out of time and concentration. Hopefully somebody else can do the remainder.
Thanks.
Quoted 539 lines
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 | 10 +++++----- t/t9151/svn-mergeinfo.dump | 18 +++++++++--------- t/unit-tests/clar/README.md | 2 +- 29 files changed, 46 insertions(+), 46 deletions(-)Documentation/SubmittingPatches +1
-1@@ -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 listedDocumentation/git-sparse-checkout.adoc +1
-1@@ -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 thatDocumentation/technical/build-systems.adoc +3
-3@@ -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.builtin/pack-objects.c +1
-1@@ -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,commit-graph.h +1
-1@@ -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);compat/precompose_utf8.c +1
-1@@ -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; }git-gui/git-gui.sh +1
-1@@ -109,7 +109,7 @@ foreach p [split $env(PATH) $_path_sep] { if {[file pathtype $p] ne {absolute}} { continue } - # Keep only the first occurence of any duplicates. + # Keep only the first occurrence of any duplicates. set norm_p [file normalize $p] dict set _path_seen $norm_p 1 }git-gui/lib/choose_repository.tcl +1
-1@@ -15,7 +15,7 @@ field w_recentlist ; # Listbox containing recent repositories field w_localpath ; # Entry widget bound to local_path field done 0 ; # Finished picking the repository? -field clone_ok false ; # clone succeeeded +field clone_ok false ; # clone succeeded field local_path {} ; # Where this repository is locally field origin_url {} ; # Where we are cloning from field origin_name origin ; # What we shall call 'origin'git-gui/lib/themed.tcl +1
-1@@ -4,7 +4,7 @@ namespace eval color { # Variable colors - # Preffered way to set widget colors is using add_option. + # Preferred way to set widget colors is using add_option. # In some cases, like with tags in_diff/in_sel, we use these colors. variable select_bg lightgray variable select_fg blackhook.h +1
-1@@ -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`. * */ meson_options.txt +1
-1@@ -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',midx-write.c +2
-2@@ -1152,7 +1152,7 @@ static bool midx_needs_update(struct multi_pack_index *midx, struct write_midx_c/* * Ensure that we have a valid checksum before consulting the -* exisiting MIDX in order to determine if we can avoid an +* existing MIDX in order to determine if we can avoid an * update. * * This is necessary because the given MIDX is loaded directly @@ -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);odb/source.h +1
-1@@ -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 packfile.h +1
-1@@ -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. path.h +1
-1@@ -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);po/el.po +1
-1@@ -2748,7 +2748,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Εντολές Χαμηλού Επιπέδου / Ερωτημάτων" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Εντολές Χαμηλού Επιπέδου / Συγχρονισμού Αποθετηρίων" #: help.c:38po/ko.po +1
-1@@ -2062,7 +2062,7 @@ msgid "Low-level Commands / Interrogators" msgstr "보조 명령 / 정보 획득 기능" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "보조 명령 / 저장소 동기화 기능" #: help.c:38reftable/system.h +1
-1@@ -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. */ t/README +1
-1@@ -972,7 +972,7 @@ see test-lib-functions.sh for the full list and their options. - test_lazy_prereq <prereq> <script> Declare the way to determine if a test prerequisite <prereq> is - satisified or not, but delay the actual determination until the + satisfied or not, but delay the actual determination until the prerequisite is actually used by "test_have_prereq" or the three-arg form of the test_expect_* functions. For example, this is how the SYMLINKS prerequisite is declared to see if the platformt/chainlint.pl +1
-1@@ -35,7 +35,7 @@ # # In other languages, `1+2` would typically be scanned as three tokens # (`1`, `+`, and `2`), but in shell it is a single token. However, the similar -# `1 + 2`, which embeds whitepace, is scanned as three token in shell, as well. +# `1 + 2`, which embeds whitespace, is scanned as three token in shell, as well. # In shell, several characters with special meaning lose that meaning when not # surrounded by whitespace. For instance, the negation operator `!` is special # when standing alone surrounded by whitespace; whereas in `foo!uucp` it ist/chainlint/chain-break-false.expect +1
-1@@ -1,4 +1,4 @@ -2 if condition not satisified +2 if condition not satisfied 3 then 4 echo it did not work... 5 echo failed!t/chainlint/chain-break-false.test +1
-1@@ -1,6 +1,6 @@ test_expect_success 'chain-break-false' ' # LINT: broken &&-chain okay if explicit "false" signals failure -if condition not satisified +if condition not satisfied then echo it did not work... echo failed!t/t1700-split-index.sh +1
-1@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' ' git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we wont catch the problem + # must not write a new shareindex, or we won't catch the problem git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err && # i.e. do not expect warnings like # could not freshen shared index .../shareindex.00000...t/t3909-stash-pathspec-file.sh +3
-3@@ -29,7 +29,7 @@ verify_expect () { test_expect_success 'simplest' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&@@ -47,7 +47,7 @@ test_expect_success 'simplest' ' test_expect_success '--pathspec-file-nul' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&@@ -66,7 +66,7 @@ test_expect_success '--pathspec-file-nul' ' test_expect_success 'only touches what was listed' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&t/t4052-stat-output.sh +1
-1@@ -420,7 +420,7 @@ test_expect_success 'merge --stat respects COLUMNS with long name' ' # enough terminal display width, will contain the following line: # "<RED>|<RESET> ${FILENAME} | 0" # where "<RED>" and "<RESET>" are ANSI escape codes to color the text. -# To calculate the minimium terminal display width MIN_TERM_WIDTH so that the +# To calculate the minimum terminal display width MIN_TERM_WIDTH so that the # FILENAME in the diffstat will not be shortened, we take the FILENAME length # and add 9 to it. # To check if the diffstat width, when the line_prefix (the "<RED>|<RESET>" oft/t4067-diff-partial-clone.sh +1
-1@@ -159,7 +159,7 @@ test_expect_success 'diff succeeds even if prefetch triggered by break-rewrites' # We need baz to trigger break-rewrites detection. git -C client reset --hard HEAD && - # break-rewrites detction in reset. + # break-rewrites detection in reset. git -C client reset HEAD~1 't/t9150/svk-merge.dump +5
-5@@ -77,7 +77,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -206,7 +206,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -310,7 +310,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -417,7 +417,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -534,7 +534,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it willt/t9151/svn-mergeinfo.dump +9
-9@@ -87,7 +87,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -260,7 +260,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -365,7 +365,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -473,7 +473,7 @@ Content-length: 2529 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -578,7 +578,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -767,7 +767,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -948,7 +948,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -1172,7 +1172,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will@@ -1414,7 +1414,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it willt/unit-tests/clar/README.md +1
-1@@ -138,7 +138,7 @@ raise errors during test execution. __Caution:__ If you use assertions inside of `test_suitename__initialize`, make sure that you do not rely on `__initialize` being completely run inside your `test_suitename__cleanup` function. Otherwise you might -encounter ressource cleanup twice. +encounter resource cleanup twice. ## How does Clar work?
Hi Mr. Hamano, I've checked the rest of patch, I believe Mr. Kreimer is doing great. Meanwhile, I'm wondering if you are happy to accept patches about typos or not, since I have other remaining corrections for typos here. If you don't mind, may I send a version of it add sort this patch series out.
Thanks,
Weijie Yuan
Quoted 7 lines · Kristoffer Haugsbakk
Quoted 6 lines · Andrew Kreimer
There are some typos in the documentation, comments, etc. Fix them via codespell.
Signed-off-by Andrew Kreimer <[email protected]>---
[snip]
I went through the typos in my previous message and with the exception of po/ they all look good. They are all either documentation typos or typos in code comments. And they are all legitimate, in other words not false positives.
With Junio’s email in mind, I think a second version which just drops the po/ and git-gui typo fixes would be good. Since they are different projects.
Quoted 9 lines · Kristoffer Haugsbakk
Quoted 7 lines · Kristoffer Haugsbakk
Quoted 6 lines · Andrew Kreimer
There are some typos in the documentation, comments, etc. Fix them via codespell.
Signed-off-by Andrew Kreimer <[email protected]>---
[snip]
Quoted 8 lines
I went through the typos in my previous message and with the exception of
po/they all look good. They are all either documentation typos or typos in code comments. And they are all legitimate, in other words not false positives.With Junio’s email in mind, I think a second version which just drops the
po/and git-gui typo fixes would be good. Since they are different projects.
Thanks!.
PATCH 1/1 docs: fix typos and grammar
In reply to Weijie YuanFix several spelling mistakes, subject-verb agreement issues, and duplicated words.
---
Sorry for my previous meaningless email, now I realize it's better to come up with a real patch, insteading of talks.
I hope this does not duplicate the previous patch, though I've check twice.
summary:
* the ones that has
-> have
* duplicated words
* ambigious -> ambiguous
ps: my last email has an invalid Message-ID, sorry for b4 users.
Documentation/fetch-options.adoc | 2 +- combine-diff.c | 2 +- contrib/subtree/t/t7900-subtree.sh | 2 +- csum-file.h | 2 +- delta-islands.c | 2 +- diffcore-pickaxe.c | 2 +- odb.h | 2 +- parse-options.c | 2 +- rerere.c | 2 +- t/t4203-mailmap.sh | 2 +- t/t9100-git-svn-basic.sh | 2 +- t/test-lib-github-workflow-markup.sh | 2 +- t/test-lib-junit.sh | 2 +- tree-walk.h | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-)
Documentation/fetch-options.adoc +1 -1
@@ -1,6 +1,6 @@ `--all`:: `--no-all`:: - Fetch all remotes, except for the ones that has the + Fetch all remotes, except for the ones that have the `remote.<name>.skipFetchAll` configuration variable set. This overrides the configuration variable `fetch.all`.
combine-diff.c +1 -1
@@ -666,7 +666,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,* (-) line, which records from what parents the line * was removed; this line does not appear in the result. * then check the set of parents the result has difference -* from, from all lines. If there are lines that has +* from, from all lines. If there are lines that have * different set of parents that the result has differences * from, that means we have more than two versions. *
contrib/subtree/t/t7900-subtree.sh +1 -1
@@ -75,7 +75,7 @@ test_create_pre2_32_repo () { # # Create a simple subtree on a new branch named ORPHAN in REPO. # The subtree is then merged into the current branch of REPO, -# under PREFIX. The generated subtree has has one commit +# under PREFIX. The generated subtree has one commit # with subject and tag FILENAME with a single file "FILENAME.t" # # When this method returns:
csum-file.h +1 -1
@@ -52,7 +52,7 @@ struct hashfd_options {*/ struct progress *progress; -/* The length of the buffer that shall be used read read data. */ +/* The length of the buffer that shall be used to read data. */ size_t buffer_len; };
delta-islands.c +1 -1
@@ -527,7 +527,7 @@ void free_island_marks(void)kh_destroy_oid_map (island_marks); } -/* detect use-after-free with a an address which is never valid: */ +/* detect use-after-free with an address which is never valid: */ island_marks = (void *)-1 ; }
diffcore-pickaxe.c +1 -1
@@ -203,7 +203,7 @@ static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,for (i =0 ; i < q->nr; i++)diff_free_filepair (q->queue[i]); }else { -/* Showing only the filepairs that has the needle */ +/* Showing only the filepairs that have the needle */ for (i =0 ; i < q->nr; i++) {struct diff_filepair *p = q->queue[i];if (pickaxe_match (p, o, regexp, kws, fn))
odb.h +1 -1
@@ -40,7 +40,7 @@ struct object_database {struct repository *repo;/* -* State of current current object database transaction. Only one +* State of current object database transaction. Only one * transaction may be pending at a time. Is NULL when no transaction is * configured. */
parse-options.c +1 -1
@@ -1149,7 +1149,7 @@ enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx, (ctx->flags & PARSE_OPT_KEEP_UNKNOWN_OPT)) {/* * Found an unknown option given to a command with -* subcommands that has a default operation mode: +* subcommands that have a default operation mode: * we treat this option and all remaining args as * arguments meant to that default operation mode. * So we are done parsing.
rerere.c +1 -1
@@ -548,7 +548,7 @@ static int check_one_conflict(struct index_state *istate, int i, int *type)/* * Scan the index and find paths that have conflicts that rerere can -* handle, i.e. the ones that has both stages #2 and #3. +* handle, i.e. the ones that have both stages #2 and #3. * * NEEDSWORK: we do not record or replay a previous "resolve by * deletion" for a delete-modify conflict, as that is inherently risky
t/t4203-mailmap.sh +1 -1
@@ -180,7 +180,7 @@ test_expect_success 'mailmap.file set' ' git shortlog HEAD >actual && test_cmp expect actual && - # The internal_mailmap/.mailmap file is an a subdirectory, but + # The internal_mailmap/.mailmap file is in a subdirectory, but # as shown here it can also be outside the repository test_when_finished "rm -rf sub-repo" && git clone . sub-repo &&
t/t9100-git-svn-basic.sh +1 -1
@@ -232,7 +232,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" ' test_cmp expected.$(test_oid algo) a ' -test_expect_success 'exit if remote refs are ambigious' ' +test_expect_success 'exit if remote refs are ambiguous' ' git config --add svn-remote.svn.fetch \ bar:refs/remotes/git-svn && test_must_fail git svn migrate
t/test-lib-github-workflow-markup.sh +1 -1
@@ -18,7 +18,7 @@ # # The idea is for `test-lib.sh` to source this file when run in GitHub # workflows; these functions will then override (empty) functions -# that are are called at the appropriate times during the test runs. +# that are called at the appropriate times during the test runs. test_skip_test_preamble=t
t/test-lib-junit.sh +1 -1
@@ -19,7 +19,7 @@ # # The idea is for `test-lib.sh` to source this file when the user asks # for JUnit XML; these functions will then override (empty) functions -# that are are called at the appropriate times during the test runs. +# that are called at the appropriate times during the test runs. start_test_output () { junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"
tree-walk.h +1 -1
@@ -177,7 +177,7 @@ struct traverse_info {/** * Walk trees starting with "tree_oid" to find the entry for "name", and -* return the the object name and the mode of the found entry via the +* return the object name and the mode of the found entry via the * "oid" and "mode" parameters. Return 0 if the entry is found, and -1 * otherwise. */
--
2.54.0
PATCH v2 1/1 doc: fix typos via codespell
In reply to Andrew KreimerThere are some typos in the documentation, comments, etc. Fix them via codespell.
---
v2:
- Drop typos under po/ and git-gui/ (different projects).
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 | 10 +++++----- t/t9151/svn-mergeinfo.dump | 18 +++++++++--------- t/unit-tests/clar/README.md | 2 +- 24 files changed, 40 insertions(+), 40 deletions(-)
Documentation/SubmittingPatches +1 -1
@@ -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
Documentation/git-sparse-checkout.adoc +1 -1
@@ -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
Documentation/technical/build-systems.adoc +3 -3
@@ -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.
builtin/pack-objects.c +1 -1
@@ -1349,7 +1349,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,
commit-graph.h +1 -1
@@ -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);
compat/precompose_utf8.c +1 -1
@@ -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; }
hook.h +1 -1
@@ -128,7 +128,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`. * */
meson_options.txt +1 -1
@@ -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',
midx-write.c +1 -1
@@ -1461,7 +1461,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);
odb/source.h +1 -1
@@ -341,7 +341,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
packfile.h +1 -1
@@ -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.
path.h +1 -1
@@ -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);
reftable/system.h +1 -1
@@ -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. */
t/README +1 -1
@@ -972,7 +972,7 @@ see test-lib-functions.sh for the full list and their options. - test_lazy_prereq <prereq> <script> Declare the way to determine if a test prerequisite <prereq> is - satisified or not, but delay the actual determination until the + satisfied or not, but delay the actual determination until the prerequisite is actually used by "test_have_prereq" or the three-arg form of the test_expect_* functions. For example, this is how the SYMLINKS prerequisite is declared to see if the platform
t/chainlint.pl +1 -1
@@ -35,7 +35,7 @@ # # In other languages, `1+2` would typically be scanned as three tokens # (`1`, `+`, and `2`), but in shell it is a single token. However, the similar -# `1 + 2`, which embeds whitepace, is scanned as three token in shell, as well. +# `1 + 2`, which embeds whitespace, is scanned as three token in shell, as well. # In shell, several characters with special meaning lose that meaning when not # surrounded by whitespace. For instance, the negation operator `!` is special # when standing alone surrounded by whitespace; whereas in `foo!uucp` it is
t/chainlint/chain-break-false.expect +1 -1
@@ -1,4 +1,4 @@ -2 if condition not satisified +2 if condition not satisfied 3 then 4 echo it did not work... 5 echo failed!
t/chainlint/chain-break-false.test +1 -1
@@ -1,6 +1,6 @@ test_expect_success 'chain-break-false' ' # LINT: broken &&-chain okay if explicit "false" signals failure -if condition not satisified +if condition not satisfied then echo it did not work... echo failed!
t/t1700-split-index.sh +1 -1
@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' ' git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we wont catch the problem + # must not write a new shareindex, or we won't catch the problem git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err && # i.e. do not expect warnings like # could not freshen shared index .../shareindex.00000...
t/t3909-stash-pathspec-file.sh +3 -3
@@ -29,7 +29,7 @@ verify_expect () { test_expect_success 'simplest' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
@@ -47,7 +47,7 @@ test_expect_success 'simplest' ' test_expect_success '--pathspec-file-nul' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
@@ -66,7 +66,7 @@ test_expect_success '--pathspec-file-nul' ' test_expect_success 'only touches what was listed' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
t/t4052-stat-output.sh +1 -1
@@ -420,7 +420,7 @@ test_expect_success 'merge --stat respects COLUMNS with long name' ' # enough terminal display width, will contain the following line: # "<RED>|<RESET> ${FILENAME} | 0" # where "<RED>" and "<RESET>" are ANSI escape codes to color the text. -# To calculate the minimium terminal display width MIN_TERM_WIDTH so that the +# To calculate the minimum terminal display width MIN_TERM_WIDTH so that the # FILENAME in the diffstat will not be shortened, we take the FILENAME length # and add 9 to it. # To check if the diffstat width, when the line_prefix (the "<RED>|<RESET>" of
t/t4067-diff-partial-clone.sh +1 -1
@@ -159,7 +159,7 @@ test_expect_success 'diff succeeds even if prefetch triggered by break-rewrites' # We need baz to trigger break-rewrites detection. git -C client reset --hard HEAD && - # break-rewrites detction in reset. + # break-rewrites detection in reset. git -C client reset HEAD~1 '
t/t9150/svk-merge.dump +5 -5
@@ -77,7 +77,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -206,7 +206,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -310,7 +310,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -417,7 +417,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -534,7 +534,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
t/t9151/svn-mergeinfo.dump +9 -9
@@ -87,7 +87,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -260,7 +260,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -365,7 +365,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -473,7 +473,7 @@ Content-length: 2529 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -578,7 +578,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -767,7 +767,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -948,7 +948,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -1172,7 +1172,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
@@ -1414,7 +1414,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will
t/unit-tests/clar/README.md +1 -1
@@ -138,7 +138,7 @@ raise errors during test execution. __Caution:__ If you use assertions inside of `test_suitename__initialize`, make sure that you do not rely on `__initialize` being completely run inside your `test_suitename__cleanup` function. Otherwise you might -encounter ressource cleanup twice. +encounter resource cleanup twice. ## How does Clar work?
Interdiff against v1:
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 40e95bccb4..23fe76e498 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -109,7 +109,7 @@ foreach p [split $env(PATH) $_path_sep] {
if {[file pathtype $p] ne {absolute}} {
continue
}
- # Keep only the first occurrence of any duplicates.
+ # Keep only the first occurence of any duplicates.
set norm_p [file normalize $p]
dict set _path_seen $norm_p 1
}
diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl index a4703af028..7e1462a20c 100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -15,7 +15,7 @@ field w_recentlist ; # Listbox containing recent repositories
field w_localpath ; # Entry widget bound to local_path
field done 0 ; # Finished picking the repository?
-field clone_ok false ; # clone succeeded
+field clone_ok false ; # clone succeeeded
field local_path {} ; # Where this repository is locally
field origin_url {} ; # Where we are cloning from
field origin_name origin ; # What we shall call 'origin'
diff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl index f4cffeac66..c18e201d85 100644
--- a/git-gui/lib/themed.tcl
+++ b/git-gui/lib/themed.tcl
@@ -4,7 +4,7 @@
namespace eval color {
# Variable colors
- # Preferred way to set widget colors is using add_option.
+ # Preffered way to set widget colors is using add_option.
# In some cases, like with tags in_diff/in_sel, we use these colors.
variable select_bg lightgray
variable select_fg black
diff --git a/po/el.po b/po/el.po
index c45560c996..703f46d0c7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2748,7 +2748,7 @@ msgid "Low-level Commands / Interrogators"
msgstr "Εντολές Χαμηλού Επιπέδου / Ερωτημάτων"
#: help.c:37
-msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories"
msgstr "Εντολές Χαμηλού Επιπέδου / Συγχρονισμού Αποθετηρίων"
#: help.c:38
diff --git a/po/ko.po b/po/ko.po
index 6bc20a43e3..7a6847f023 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2062,7 +2062,7 @@ msgid "Low-level Commands / Interrogators"
msgstr "보조 명령 / 정보 획득 기능"
#: help.c:37
-msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories"
msgstr "보조 명령 / 저장소 동기화 기능"
#: help.c:38
Range-diff against v1:
1: 381e2c1fc3 ! 1: 674edefc99 doc: fix typos via codespell
@@ compat/precompose_utf8.c: const char *precompose_string_if_needed(const char *in
in = out;
}
- ## git-gui/git-gui.sh ##
-@@ git-gui/git-gui.sh: foreach p [split $env(PATH) $_path_sep] {
- if {[file pathtype $p] ne {absolute}} {
- continue
- }
-- # Keep only the first occurence of any duplicates.
-+ # Keep only the first occurrence of any duplicates.
- set norm_p [file normalize $p]
- dict set _path_seen $norm_p 1
- }
-
- ## git-gui/lib/choose_repository.tcl ##
-@@ git-gui/lib/choose_repository.tcl: field w_recentlist ; # Listbox containing recent repositories
- field w_localpath ; # Entry widget bound to local_path
-
- field done 0 ; # Finished picking the repository?
--field clone_ok false ; # clone succeeeded
-+field clone_ok false ; # clone succeeded
- field local_path {} ; # Where this repository is locally
- field origin_url {} ; # Where we are cloning from
- field origin_name origin ; # What we shall call 'origin'
-
- ## git-gui/lib/themed.tcl ##
-@@
-
- namespace eval color {
- # Variable colors
-- # Preffered way to set widget colors is using add_option.
-+ # Preferred way to set widget colors is using add_option.
- # In some cases, like with tags in_diff/in_sel, we use these colors.
- variable select_bg lightgray
- variable select_fg black
-
## hook.h ##
@@ hook.h: struct run_hooks_opt {
* While the callback allows piecemeal writing, it can also be
@@ path.h: void safe_create_dir(struct repository *repo, const char *dir, int share
int safe_create_dir_in_gitdir(struct repository *repo, const char *path);
- ## po/el.po ##
-@@ po/el.po: msgid "Low-level Commands / Interrogators"
- msgstr "Εντολές Χαμηλού Επιπέδου / Ερωτημάτων"
-
- #: help.c:37
--msgid "Low-level Commands / Synching Repositories"
-+msgid "Low-level Commands / Syncing Repositories"
- msgstr "Εντολές Χαμηλού Επιπέδου / Συγχρονισμού Αποθετηρίων"
-
- #: help.c:38
-
- ## po/ko.po ##
-@@ po/ko.po: msgid "Low-level Commands / Interrogators"
- msgstr "보조 명령 / 정보 획득 기능"
-
- #: help.c:37
--msgid "Low-level Commands / Synching Repositories"
-+msgid "Low-level Commands / Syncing Repositories"
- msgstr "보조 명령 / 저장소 동기화 기능"
-
- #: help.c:38
-
## reftable/system.h ##
@@ reftable/system.h: struct reftable_flock {
* to acquire the lock. If timeout_ms is 0 we don't wait, if it is negative
Signature · 1 line
2.54.0
midx-write.c static int write_midx_internal(struct write_midx_opts *opts) · line 1467
Quoted 13 lines · Andrew Kreimer
midx-write.c +1
-1@@ -1461,7 +1461,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);
You seem to have lost the following hunk from the previous round
midx-write.c +1 -1
@@ -1152,7 +1152,7 @@ static bool midx_needs_update(struct multi_pack_index *midx, struct write_midx_c/* * Ensure that we have a valid checksum before consulting the -* exisiting MIDX in order to determine if we can avoid an +* existing MIDX in order to determine if we can avoid an * update. * * This is necessary because the given MIDX is loaded directly
but it is OK as the same fix appears in 'master' thanks to 22235136 (midx-write: handle noop writes when converting incremental chains, 2026-05-19).
Other than that, I made sure that there is no other changes since the initial patch other than that the changes to po/ and git-gui/ no longer exist in the topic, which matches what the proposed commit log says.
However, there are things that BREAK tests.
t/t1700-split-index.sh test_expect_success 'do not refresh null base index' ' · line 508
Quoted 13 lines
t/t1700-split-index.sh +1
-1@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' ' git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we wont catch the problem + # must not write a new shareindex, or we won't catch the problem git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err && # i.e. do not expect warnings like # could not freshen shared index .../shareindex.00000...
The edit above is made to a STRING that is enclosed inside a pair of single quote. If we want to use "won't", we would need to write "We won'\''t", but while it may be syntactically correct as a part of shell script, it is a pointless change, as the target audience wants to see this line as if it is just a plain text.
"We will not" would be acceptable,
t/t3909-stash-pathspec-file.sh verify_expect () { · line 32
Quoted 10 lines
t/t3909-stash-pathspec-file.sh +1
-1@@ -29,7 +29,7 @@ verify_expect () { test_expect_success 'simplest' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore
Ditto. "did not ignore".
t/t3909-stash-pathspec-file.sh test_expect_success 'simplest' ' · line 50
Quoted 9 lines
t/t3909-stash-pathspec-file.sh +1
-1# --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&@@ -47,7 +47,7 @@ test_expect_success 'simplest' ' test_expect_success '--pathspec-file-nul' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore
Ditto.
t/t3909-stash-pathspec-file.sh test_expect_success '--pathspec-file-nul' ' · line 69
Quoted 9 lines
t/t3909-stash-pathspec-file.sh +1
-1# --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&@@ -66,7 +66,7 @@ test_expect_success '--pathspec-file-nul' ' test_expect_success 'only touches what was listed' ' restore_checkpoint && - # More files are written to make sure that git didnt ignore + # More files are written to make sure that git didn't ignore
Ditto.
It is a bit disappointing that the changes were guided by a tool called Codespell, yet apparently the tool does not seem to understand the syntax rules of the language the files it is modifying is written in X-<.
Thanks.
Quoted 15 lines · Junio C Hamano
[snip]
However, there are things that BREAK tests.
Quoted 11 lines
t/t1700-split-index.sh +1
-1@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' ' git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we wont catch the problem + # must not write a new shareindex, or we won't catch the problem git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err &&
Quoted 8 lines
t/t1700-split-index.sh test_expect_success 'do not refresh null base index' ' · line 508
Quoted 2 lines
t/t1700-split-index.sh +0
-0# i.e. do not expect warnings like # could not freshen shared index .../shareindex.00000...The edit above is made to a STRING that is enclosed inside a pair of single quote. If we want to use "won't", we would need to write "We won'\''t", but while it may be syntactically correct as a part of shell script, it is a pointless change, as the target audience wants to see this line as if it is just a plain text.
Sorry about not testing this on v1. “Surely this does not affect the code...” strikes again.
Quoted 5 lines
"We will not" would be acceptable,
Quoted 2 lines
t/t3909-stash-pathspec-file.sh +0
-0
Re: [PATCH] docs: fix typos and grammar
In reply to Weijie YuanQuoted 5 lines · Weijie Yuan
Fix several spelling mistakes, subject-verb agreement issues, and duplicated words.
Signed-off-by Weijie Yuan <[email protected]>---
Sorry, I lost track.
How does this patch relate to the large patch from Andrew that you reviewed earlier? Is this meant to replace it, or is it an independent effort that may or may not overlap what is fixed by the other patch? Something else?
Thanks. All the changes in _this_ patch looked sensible to me (and to my agent as well ;-).
Re: [PATCH] docs: fix typos and grammar
Quoted 1 line · Junio C Hamano
Sorry, I lost track.
You are welcome!
Quoted 4 lines
How does this patch relate to the large patch from Andrew that you reviewed earlier? Is this meant to replace it, or is it an independent effort that may or may not overlap what is fixed by the other patch? Something else?
My patch is an addition to Andrew's patch.
I think it's better to keep these "boring" typos thing in a thread, rather than in a new thread, so I replied in this thread, as it would be better to avoid cluttering the mailing list archive pages and leave them as much as possible for genuine technical discussions ;-).
Before Andrew said he was preparing for his v2, I was planning to sort Andrew's patch out and make it more logical or perhaps split it into several individual patches. But since Andrew replied he's going to do his v2, I won't take credit for his work, of course.
Quoted 2 lines
Thanks. All the changes in _this_ patch looked sensible to me (and to my agent as well ;-).
Thank you! Looking forward to making "real" contributions one day :)
Re: [PATCH] docs: fix typos and grammar
Quoted 6 lines · Weijie Yuan
Quoted 4 lines
How does this patch relate to the large patch from Andrew that you reviewed earlier? Is this meant to replace it, or is it an independent effort that may or may not overlap what is fixed by the other patch? Something else?
My patch is an addition to Andrew's patch.
Sorry for not making my point clear all at once.
My patch is an independent effort and does not overlap with Andrew's, i.e. doesn't touch the same areas as his.
And I just checked the recent archives, my patch doesn't overlap with others as well :-)
PATCH v3 1/1 doc: fix typos via codespell
In reply to Andrew KreimerThere are some typos in the documentation, comments, etc. Fix them via codespell.
---
v3:
- Address test breaking changes (strings bounded by single quotes).
- Thank you for your patience (extreme noise/gain ratio).
t/t1700-split-index.sh | 2 +- t/t3909-stash-pathspec-file.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
t/t1700-split-index.sh +1 -1
@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' ' git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we won't catch the problem + # must not write a new shareindex, or we will not catch the problem git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err && # i.e. do not expect warnings like # could not freshen shared index .../shareindex.00000...
t/t3909-stash-pathspec-file.sh +3 -3
@@ -29,7 +29,7 @@ verify_expect () { test_expect_success 'simplest' ' restore_checkpoint && - # More files are written to make sure that git didn't ignore + # More files are written to make sure that git did not ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
@@ -47,7 +47,7 @@ test_expect_success 'simplest' ' test_expect_success '--pathspec-file-nul' ' restore_checkpoint && - # More files are written to make sure that git didn't ignore + # More files are written to make sure that git did not ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
@@ -66,7 +66,7 @@ test_expect_success '--pathspec-file-nul' ' test_expect_success 'only touches what was listed' ' restore_checkpoint && - # More files are written to make sure that git didn't ignore + # More files are written to make sure that git did not ignore # --pathspec-from-file, stashing everything echo A >fileA.t && echo B >fileB.t &&
Interdiff against v2:
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 869fb4a14e..887e72a5fa 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' '
git checkout main &&
git update-index --split-index &&
test_commit more &&
- # must not write a new shareindex, or we won't catch the problem
+ # must not write a new shareindex, or we will not catch the problem
git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err &&
# i.e. do not expect warnings like
# could not freshen shared index .../shareindex.00000...
diff --git a/t/t3909-stash-pathspec-file.sh b/t/t3909-stash-pathspec-file.sh
index 3afa6bff3d..e34cea6ce1 100755
--- a/t/t3909-stash-pathspec-file.sh
+++ b/t/t3909-stash-pathspec-file.sh
@@ -29,7 +29,7 @@ verify_expect () {
test_expect_success 'simplest' '
restore_checkpoint && - # More files are written to make sure that git didn't ignore
+ # More files are written to make sure that git did not ignore
# --pathspec-from-file, stashing everything echo A >fileA.t &&
echo B >fileB.t &&
@@ -47,7 +47,7 @@ test_expect_success 'simplest' '
test_expect_success '--pathspec-file-nul' '
restore_checkpoint &&
- # More files are written to make sure that git didn't ignore
+ # More files are written to make sure that git did not ignore
# --pathspec-from-file, stashing everything echo A >fileA.t &&
echo B >fileB.t &&
@@ -66,7 +66,7 @@ test_expect_success '--pathspec-file-nul' '
test_expect_success 'only touches what was listed' '
restore_checkpoint &&
- # More files are written to make sure that git didn't ignore
+ # More files are written to make sure that git did not ignore
# --pathspec-from-file, stashing everything echo A >fileA.t &&
echo B >fileB.t &&
Range-diff against v2:
-: ---------- > 1: bcbd09129a doc: fix typos via codespell
Signature · 1 line
2.54.0
Quoted 8 lines · Andrew Kreimer
There are some typos in the documentation, comments, etc. Fix them via codespell.
Signed-off-by Andrew Kreimer <[email protected]>---
v3:
- Address test breaking changes (strings bounded by single quotes).
- Thank you for your patience (extreme noise/gain ratio).
Thanks, but this is wrong.
Quoted 4 lines
t/t1700-split-index.sh | 2 +- t/t3909-stash-pathspec-file.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[v3] should not be "on top of" [v2], but the above shows that apparently this is vastly different from [v2], which had
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 | 10 +++++----- t/t9151/svn-mergeinfo.dump | 18 +++++++++--------- t/unit-tests/clar/README.md | 2 +- 24 files changed, 40 insertions(+), 40 deletions(-)
Until the topic is merged to 'next', a new iteration of patch(es) should cleanly apply to the base that [v2] was meant to apply, but should pretend as if [v2] never existed.
t/t1700-split-index.sh test_expect_success 'do not refresh null base index' ' · line 505
Quoted 10 lines
t/t1700-split-index.sh +1
-1@@ -502,7 +502,7 @@ test_expect_success 'do not refresh null base index' ' git checkout main && git update-index --split-index && test_commit more && - # must not write a new shareindex, or we won't catch the problem + # must not write a new shareindex, or we will not catch the problem
The committed code never had "we won't" (what was in 'seen' does not count), and this patch clearly shows that this is to fix-up the breakage the previous round caused. We do not want that.
I'll squash the fix-up I already had into [v2] that I have queued, which should be sufficient to get to the state this [v3] should have been, I think.
Thanks.
Hi Junio,
Quoted 10 lines · Junio C Hamano
Quoted 2 lines · Andrew Kreimer
There are some typos in the documentation, comments, etc. Fix them via codespell.
[...]
I'll squash the fix-up I already had into [v2] that I have queued, which should be sufficient to get to the state this [v3] should have been, I think.
The mechanical nature of these fixes explains another issue: One typo fix touched two test fixtures which might seem harmless at first, but those fixtures are littered with checksums that relied on the original (misspelled) form.
Please adopt this follow-up into ak/typofixes:
-- snipsnap --
From 54aa4f7f7adf0c0e02b5463b5f7f64547e80cbce Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <[email protected]>
Date: Sat, 6 Jun 2026 22:09:04 +0200
Subject: [PATCH] svn-test-dumps: restore checksums after the hapenning typo
fix
b8b38eee85 (doc: fix typos via codespell, 2026-05-31) ran codespell against the entire tree and rewrote hapenning to happening inside the body of t/t9150/svk-merge.dump and t/t9151/svn-mergeinfo.dump. Both files are Subversion dump
files: each Node-path: block embeds Text-content-md5 / Text-content-sha1 for the new content and, on copy operations, Text-copy-source-md5 / Text-copy-source-sha1 for the source content as observed at the cited revision. None of those checksums were updated, so loading the dumps with svnadmin 1.14.5 (present in ubuntu:rolling's CI image) fails immediately with E200014: Checksum mismatch for '/trunk/Makefile' and the two tests stop before any of the assertions they actually exercise can run. The CI failure has been visible on every seen-based linux-sha256 / linux-reftable build since 2026-06-02 (the first run that picked up b8b38eee85).
Because happening and hapenning have the same length, no header byte counts need updating; only the embedded checksums do. Recompute the MD5 and SHA1 of every text body in the two dumps, and for every Node-copyfrom-path consult the path's most recently defined content to refresh the corresponding Text-copy-source-md5 / Text-copy-source-sha1. After this, svnadmin load -q accepts both dumps cleanly and t9150 and t9151 get past their setup steps.
This commit only touches the two dump files; the typo correction in their surrounding human-readable comment is preserved.
--- t/t9150/svk-merge.dump | 10 ++++---- t/t9151/svn-mergeinfo.dump | 48 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 29 deletions(-)
t/t9150/svk-merge.dump +5 -5
@@ -71,7 +71,7 @@ Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2401 -Text-content-md5: bfd8ff778d1492dc6758567373176a89 +Text-content-md5: d6a3917748b0c09ad85c2783f1d4dac1 Content-length: 2411 PROPS-END
@@ -201,7 +201,7 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2465 -Text-content-md5: 16e38d9753b061731650561ce01b1195 +Text-content-md5: 3f413450a7a26596d9e512ee385a9b19 Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's
@@ -305,7 +305,7 @@ Node-path: trunk/Makefile Node-kind: file Node-action: change Text-content-length: 2521 -Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0 +Text-content-md5: 89788781014278d76ff23648b8b08b2d Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's
@@ -412,7 +412,7 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2593 -Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba +Text-content-md5: 706d73919e6f319a0e624aa50c8b8b38 Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's
@@ -529,7 +529,7 @@ Node-path: trunk/Makefile Node-kind: file Node-action: change Text-content-length: 2713 -Text-content-md5: 0afbe34f244cd662b1f97d708c687f90 +Text-content-md5: 1c05266da99e8f01a5ccf816be47a484 Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's
t/t9151/svn-mergeinfo.dump +24 -24
120 lines not on this page · raw message
Signature · 1 line
2.54.0.windows.1.10.gd5b8d9bb7af0
Quoted 10 lines · Johannes Schindelin
Quoted 3 lines
I'll squash the fix-up I already had into [v2] that I have queued, which should be sufficient to get to the state this [v3] should have been, I think.
The mechanical nature of these fixes explains another issue: One typo fix touched two test fixtures which might seem harmless at first, but those fixtures are littered with checksums that relied on the original (misspelled) form.
Please adopt this follow-up into ak/typofixes:
Thanks. You often keep your eyes peeled to spot these forgotten bits, which is very very much appreciated.
I briefly wondered if this was to be done by me or it was an request to Andrew, but since I've promised to squash the update into what I have myself, I'll do another squashing into the result, instead of asking Andrew to update the v2+v3 with these fixes.
Luckily, b8b38eee85 is *not* yet in 'next', so we can just squash the [v3] from Andrew and this fixup from you into it to keep the test passing with or without the "typo fix", to maintain bisectability.
Somebody has to come up with a bit of tweak to the log message to explain what has been done in all these three pieces when it happens. I may ask some agent to prepare a draft, review it myself, and perhaps redo it myself from the originals without taking anything from agent output, as I am still skeptical about all these AI hype ;-).
Quoted 227 lines
-- snipsnap --
From54aa4f7f7adf0c0e02b5463b5f7f64547e80cbceMon Sep 17 00:00:00 2001
From: Johannes Schindelin <[email protected]>
Date: Sat, 6 Jun 2026 22:09:04 +0200
Subject: [PATCH] svn-test-dumps: restore checksums after thehapenningtypo
fix
b8b38eee85(doc: fix typos via codespell, 2026-05-31) ran codespell against the entire tree and rewrotehapenningtohappeninginside the body oft/t9150/svk-merge.dumpandt/t9151/svn-mergeinfo.dump. Both files are Subversion dump
files: eachNode-path:block embedsText-content-md5/Text-content-sha1for the new content and, on copy operations,Text-copy-source-md5/Text-copy-source-sha1for the source content as observed at the cited revision. None of those checksums were updated, so loading the dumps with svnadmin 1.14.5 (present inubuntu:rolling's CI image) fails immediately withE200014: Checksum mismatch for '/trunk/Makefile'and the two tests stop before any of the assertions they actually exercise can run. The CI failure has been visible on everyseen-based linux-sha256 / linux-reftable build since 2026-06-02 (the first run that picked upb8b38eee85).Because
happeningandhapenninghave the same length, no header byte counts need updating; only the embedded checksums do. Recompute the MD5 and SHA1 of every text body in the two dumps, and for everyNode-copyfrom-pathconsult the path's most recently defined content to refresh the correspondingText-copy-source-md5/Text-copy-source-sha1. After this,svnadmin load -qaccepts both dumps cleanly and t9150 and t9151 get past their setup steps.This commit only touches the two dump files; the typo correction in their surrounding human-readable comment is preserved.
Assisted-by Opus 4.7Signed-off-by Johannes Schindelin <[email protected]>--- t/t9150/svk-merge.dump | 10 ++++---- t/t9151/svn-mergeinfo.dump | 48 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 29 deletions(-)t/t9150/svk-merge.dump +5
-5@@ -71,7 +71,7 @@ Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2401 -Text-content-md5: bfd8ff778d1492dc6758567373176a89 +Text-content-md5: d6a3917748b0c09ad85c2783f1d4dac1 Content-length: 2411 PROPS-END@@ -201,7 +201,7 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2465 -Text-content-md5: 16e38d9753b061731650561ce01b1195 +Text-content-md5: 3f413450a7a26596d9e512ee385a9b19 Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's@@ -305,7 +305,7 @@ Node-path: trunk/Makefile Node-kind: file Node-action: change Text-content-length: 2521 -Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0 +Text-content-md5: 89788781014278d76ff23648b8b08b2d Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's@@ -412,7 +412,7 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2593 -Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba +Text-content-md5: 706d73919e6f319a0e624aa50c8b8b38 Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's@@ -529,7 +529,7 @@ Node-path: trunk/Makefile Node-kind: file Node-action: change Text-content-length: 2713 -Text-content-md5: 0afbe34f244cd662b1f97d708c687f90 +Text-content-md5: 1c05266da99e8f01a5ccf816be47a484 Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1'st/t9151/svn-mergeinfo.dump +24
-24@@ -80,8 +80,8 @@ Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2401 -Text-content-md5: bfd8ff778d1492dc6758567373176a89 -Text-content-sha1: 103205ce331f7d64086dba497574734f78439590 +Text-content-md5: d6a3917748b0c09ad85c2783f1d4dac1 +Text-content-sha1: 9ffe895eb95d4a7c2ee2712dcf7a13637edee6a9 Content-length: 2411 PROPS-END@@ -194,8 +194,8 @@ Node-kind: file Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/Makefile -Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89 -Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590 +Text-copy-source-md5: d6a3917748b0c09ad85c2783f1d4dac1 +Text-copy-source-sha1: 9ffe895eb95d4a7c2ee2712dcf7a13637edee6a9 Revision-number: 4@@ -228,8 +228,8 @@ Node-kind: file Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/Makefile -Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89 -Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590 +Text-copy-source-md5: d6a3917748b0c09ad85c2783f1d4dac1 +Text-copy-source-sha1: 9ffe895eb95d4a7c2ee2712dcf7a13637edee6a9 Revision-number: 5@@ -254,8 +254,8 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2465 -Text-content-md5: 16e38d9753b061731650561ce01b1195 -Text-content-sha1: 36da4b84ea9b64218ab48171dfc5c48ae025f38b +Text-content-md5: 3f413450a7a26596d9e512ee385a9b19 +Text-content-sha1: b3cd389d63c5e3af4fe22b7464cf97968662ad1a Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's@@ -359,8 +359,8 @@ Node-path: branches/right/Makefile Node-kind: file Node-action: change Text-content-length: 2521 -Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0 -Text-content-sha1: 4f29afd038e52f45acb5ef8c41acfc70062a741a +Text-content-md5: 89788781014278d76ff23648b8b08b2d +Text-content-sha1: f52afb2d6230e5a418416b77c3c9ad610edfd202 Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's@@ -467,8 +467,8 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2529 -Text-content-md5: f6b197cc3f2e89a83e545d4bb003de73 -Text-content-sha1: 2f656677cfec0bceec85e53036ffb63e25126f8e +Text-content-md5: abcac8d04eb061b0a3053e359e44a2a0 +Text-content-sha1: 866caf95e04809a5ed897aea41075b24833612ea Content-length: 2529 # -DCOLLISION_CHECK if you believe that SHA1's@@ -572,8 +572,8 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2593 -Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba -Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10 +Text-content-md5: 706d73919e6f319a0e624aa50c8b8b38 +Text-content-sha1: 9992d5a9aea960c7856ef6a9364aedd5b710ef53 Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's@@ -689,8 +689,8 @@ Node-kind: file Node-action: add Node-copyfrom-rev: 8 Node-copyfrom-path: branches/left/Makefile -Text-copy-source-md5: 5ccff689fb290e00b85fe18ee50c54ba -Text-copy-source-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10 +Text-copy-source-md5: 706d73919e6f319a0e624aa50c8b8b38 +Text-copy-source-sha1: 9992d5a9aea960c7856ef6a9364aedd5b710ef53@@ -761,8 +761,8 @@ Node-path: trunk/Makefile Node-kind: file Node-action: change Text-content-length: 2593 -Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba -Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10 +Text-content-md5: 706d73919e6f319a0e624aa50c8b8b38 +Text-content-sha1: 9992d5a9aea960c7856ef6a9364aedd5b710ef53 Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's@@ -942,8 +942,8 @@ Node-path: trunk/Makefile Node-kind: file Node-action: change Text-content-length: 2713 -Text-content-md5: 0afbe34f244cd662b1f97d708c687f90 -Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14 +Text-content-md5: 1c05266da99e8f01a5ccf816be47a484 +Text-content-sha1: 0cba212974e2b288389d73317f3220be11158e00 Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's@@ -1166,8 +1166,8 @@ Node-path: branches/left-sub/Makefile Node-kind: file Node-action: change Text-content-length: 2713 -Text-content-md5: 0afbe34f244cd662b1f97d708c687f90 -Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14 +Text-content-md5: 1c05266da99e8f01a5ccf816be47a484 +Text-content-sha1: 0cba212974e2b288389d73317f3220be11158e00 Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's@@ -1408,8 +1408,8 @@ Node-path: branches/left/Makefile Node-kind: file Node-action: change Text-content-length: 2713 -Text-content-md5: 0afbe34f244cd662b1f97d708c687f90 -Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14 +Text-content-md5: 1c05266da99e8f01a5ccf816be47a484 +Text-content-sha1: 0cba212974e2b288389d73317f3220be11158e00 Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's