From 26eab80642812a5ad956c77df8dbaf702ee4bac6 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:21 +0000 Subject: [PATCH 01/19] config.mak.dev: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- config.mak.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.dev b/config.mak.dev index 5229c35484..fe6eb529b1 100644 --- a/config.mak.dev +++ b/config.mak.dev @@ -70,7 +70,7 @@ DEVELOPER_CFLAGS += -Wno-missing-braces endif endif -# Old versions of clang complain about initializaing a +# Old versions of clang complain about initializing a # struct-within-a-struct using just "{0}" rather than "{{0}}". This # error is considered a false-positive and not worth fixing, because # new clang versions do not, so just disable it. From 4b8c76638ffbb61b8ee2f4819146c89c574a5271 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:22 +0000 Subject: [PATCH 02/19] diffcore-rename: fix typos Fix typos in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- diffcore-rename.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index fab45b10d7..3d6826baa3 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -933,7 +933,7 @@ static int find_basename_matches(struct diff_options *options, * spend more cycles to find similarities between files, so it may * be less likely that this heuristic is wanted. If someone is * doing break detection, that means they do not want filename - * similarity to imply any form of content similiarity, and thus + * similarity to imply any form of content similarity, and thus * this heuristic would definitely be incompatible. */ @@ -1534,7 +1534,7 @@ void diffcore_rename_extended(struct diff_options *options, * - remove ones not found in relevant_sources * and * - remove ones in relevant_sources which are needed only - * for directory renames IF no ancestory directory + * for directory renames IF no ancestry directory * actually needs to know any more individual path * renames under them */ From be645cd268c2b1b9ee2e1d12ac309e696c8999e0 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:23 +0000 Subject: [PATCH 03/19] fsmonitor-settings: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- fsmonitor-settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c index e818583420..a6587a8972 100644 --- a/fsmonitor-settings.c +++ b/fsmonitor-settings.c @@ -7,7 +7,7 @@ #include "fsmonitor-path-utils.h" /* - * We keep this structure defintion private and have getters + * We keep this structure definition private and have getters * for all fields so that we can lazy load it as needed. */ struct fsmonitor_settings { From bbe92166d42037cf9d0ef47931d343aac184489e Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:24 +0000 Subject: [PATCH 04/19] git-instaweb: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- git-instaweb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-instaweb.sh b/git-instaweb.sh index 994431c887..8dbe21d588 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -612,7 +612,7 @@ python_conf() { ln -sf "$root/static" "$fqgitdir/gitweb/$httpd_only/" # generate a standalone 'python http.server' script in $fqgitdir/gitweb - # This asumes that python is in user's $PATH + # This assumes that python is in user's $PATH # This script is Python 2 and 3 compatible cat > "$fqgitdir/gitweb/gitweb.py" < Date: Thu, 19 Sep 2024 18:34:25 +0000 Subject: [PATCH 05/19] git-p4: fix typos Fix typos in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- git-p4.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index f1ab31d540..c0ca7becaf 100755 --- a/git-p4.py +++ b/git-p4.py @@ -54,7 +54,7 @@ import time import zipfile import zlib -# On python2.7 where raw_input() and input() are both availble, +# On python2.7 where raw_input() and input() are both available, # we want raw_input's semantics, but aliased to input for python3 # compatibility # support basestring in python3 @@ -1804,7 +1804,7 @@ class P4Submit(Command, P4UserMap): status from the script will abort the process. The purpose of the hook is to edit the message file in place, and it is not - supressed by the `--no-verify` option. This hook is called even if + suppressed by the `--no-verify` option. This hook is called even if `--prepare-p4-only` is set. The `p4-changelist` hook is executed after the changelist message has been From c055a2910960172cdef0ea87d5a1f248845a43fd Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:26 +0000 Subject: [PATCH 06/19] gpg-interface: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- gpg-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpg-interface.c b/gpg-interface.c index 5c824aeb25..4803e88e30 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -398,7 +398,7 @@ static void parse_ssh_output(struct signature_check *sigc) * Note that "PRINCIPAL" can contain whitespace, "RSA" and * "SHA256" part could be a different token that names of * the algorithms used, and "FINGERPRINT" is a hexadecimal - * string. By finding the last occurence of " with ", we can + * string. By finding the last occurrence of " with ", we can * reliably parse out the PRINCIPAL. */ sigc->result = 'B'; From 7a6d5a464171dfc4d7830b3e1d1ed8a577604f8b Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:27 +0000 Subject: [PATCH 07/19] http: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http.c b/http.c index 623ed23489..ad910a4d21 100644 --- a/http.c +++ b/http.c @@ -1685,7 +1685,7 @@ void run_active_slot(struct active_request_slot *slot) * The value of slot->finished we set before the loop was used * to set our "finished" variable when our request completed. * - * 1. The slot may not have been reused for another requst + * 1. The slot may not have been reused for another request * yet, in which case it still has &finished. * * 2. The slot may already be in-use to serve another request, From a3621abaf9e5958bb6d9ad1d19af8f430c361b76 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:28 +0000 Subject: [PATCH 08/19] merge-ll: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- merge-ll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-ll.c b/merge-ll.c index 180c19df67..b32bef6e57 100644 --- a/merge-ll.c +++ b/merge-ll.c @@ -332,7 +332,7 @@ static int read_merge_config(const char *var, const char *value, * %X - the revision for our version * %Y - the revision for their version * - * If the file is not named indentically in all versions, then each + * If the file is not named identically in all versions, then each * revision is joined with the corresponding path, separated by a colon. * The external merge driver should write the results in the * file named by %A, and signal that it has done with zero exit From a966ad1e1b5d3c4788294262ba4bcd67f79176ea Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:29 +0000 Subject: [PATCH 09/19] merge-ort: fix typos Fix typos in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- merge-ort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/merge-ort.c b/merge-ort.c index e9d01ac7f7..474ba15c01 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1148,7 +1148,7 @@ static void collect_rename_info(struct merge_options *opt, * Update dir_rename_mask (determines ignore-rename-source validity) * * dir_rename_mask helps us keep track of when directory rename - * detection may be relevant. Basically, whenver a directory is + * detection may be relevant. Basically, whenever a directory is * removed on one side of history, and a file is added to that * directory on the other side of history, directory rename * detection is relevant (meaning we have to detect renames for all @@ -3836,7 +3836,7 @@ static int write_completed_directory(struct merge_options *opt, * src/moduleB 2 * * which is used to know that xtract.c & token.txt are from the - * toplevel dirctory, while umm.c & stuff.h & baz.c are from the + * toplevel directory, while umm.c & stuff.h & baz.c are from the * src/moduleB directory. Again, following the example above, * once we need to process src/moduleB, then info->offsets is * updated to From 28012b915c1e6c535dcd42fc1460ea070e5f978f Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:30 +0000 Subject: [PATCH 10/19] object-file: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- object-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/object-file.c b/object-file.c index 065103be3e..d9e6f3650c 100644 --- a/object-file.c +++ b/object-file.c @@ -2275,7 +2275,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len, /* * Common steps for write_loose_object and stream_loose_object to - * end writing loose oject: + * end writing loose object: * * - End the compression of zlib stream. * - Get the calculated oid. From e13c49a4c56460c902b6d5ba8dfcf3c8530842eb Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:31 +0000 Subject: [PATCH 11/19] pretty: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- pretty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pretty.c b/pretty.c index 44222fb83c..e904bd1ea5 100644 --- a/pretty.c +++ b/pretty.c @@ -2198,7 +2198,7 @@ static void strbuf_add_tabexpand(struct strbuf *sb, struct grep_opt *opt, } /* - * pp_handle_indent() prints out the intendation, and + * pp_handle_indent() prints out the indentation, and * the whole line (without the final newline), after * de-tabifying. */ From d9369f78e71ff909e93f532961f357f15e2f89b7 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:32 +0000 Subject: [PATCH 12/19] read-cache-ll: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- read-cache-ll.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache-ll.h b/read-cache-ll.h index e0e39607ef..b5d11d07a8 100644 --- a/read-cache-ll.h +++ b/read-cache-ll.h @@ -151,7 +151,7 @@ enum sparse_index_mode { /* * The index has already been collapsed to sparse directories - * whereever possible. + * wherever possible. */ INDEX_COLLAPSED, From ce42f57af4e4f6fca7d392995e849b0fab3facd6 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:33 +0000 Subject: [PATCH 13/19] rebase: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebase.c b/rebase.c index 69a1822da3..9d1ae95978 100644 --- a/rebase.c +++ b/rebase.c @@ -11,7 +11,7 @@ * The callers that care if (any) rebase is requested should say * if (REBASE_TRUE <= rebase_parse_value(string)) * - * The callers that want to differenciate an unrecognised value and + * The callers that want to differentiate an unrecognised value and * false can do so by treating _INVALID and _FALSE differently. */ enum rebase_type rebase_parse_value(const char *value) From 619cbc01a34f037fa8ddb20d67f81f5f3cb01f9e Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:35 +0000 Subject: [PATCH 14/19] refs: fix typos Fix typos in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- refs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/refs.h b/refs.h index b3e39bc257..833fd39235 100644 --- a/refs.h +++ b/refs.h @@ -15,7 +15,7 @@ enum ref_storage_format ref_storage_format_by_name(const char *name); const char *ref_storage_format_to_name(enum ref_storage_format ref_storage_format); /* - * Resolve a reference, recursively following symbolic refererences. + * Resolve a reference, recursively following symbolic references. * * Return the name of the non-symbolic reference that ultimately pointed * at the resolved object name. The return value, if not NULL, is a @@ -487,7 +487,7 @@ int refs_delete_reflog(struct ref_store *refs, const char *refname); * from UTC. Its absolute value is formed by multiplying the hour * part by 100 and adding the minute part. For example, 1 hour ahead * of UTC, CET == "+0100", is represented as positive one hundred (not - * postiive sixty). + * positive sixty). * * The msg parameter is a single complete line; a reflog message given * to refs_delete_ref, refs_update_ref, etc. is returned to the @@ -978,7 +978,7 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt); /* * Some of the names specified by refs have special meaning to Git. - * Organize these namespaces in a comon 'ref_namespace' array for + * Organize these namespaces in a common 'ref_namespace' array for * reference from multiple places in the codebase. */ From a0ef3816c11ff158179d4e1567b8ac19ebe8e9c9 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:36 +0000 Subject: [PATCH 15/19] revision: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- revision.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revision.h b/revision.h index 0e470d1df1..71e984c452 100644 --- a/revision.h +++ b/revision.h @@ -549,7 +549,7 @@ int rewrite_parents(struct rev_info *revs, * The log machinery saves the original parent list so that * get_saved_parents() can later tell what the real parents of the * commits are, when commit->parents has been modified by history - * simpification. + * simplification. * * get_saved_parents() will transparently return commit->parents if * history simplification is off. From b71d52cef598521865eb9d8cf9f7a95e685a76aa Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:37 +0000 Subject: [PATCH 16/19] run-command: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- run-command.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-command.h b/run-command.h index 03e7222d8b..0df25e445f 100644 --- a/run-command.h +++ b/run-command.h @@ -535,7 +535,7 @@ enum start_bg_result { /* timeout expired waiting for child to become "ready" */ SBGR_TIMEOUT, - /* child process exited or was signalled before becomming "ready" */ + /* child process exited or was signalled before becoming "ready" */ SBGR_DIED, }; From d1d93ae8b1ee42b8d10fa083241237418830d0f4 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:38 +0000 Subject: [PATCH 17/19] setup: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.c b/setup.c index d458edcc02..800f1d1a01 100644 --- a/setup.c +++ b/setup.c @@ -518,7 +518,7 @@ static void setup_original_cwd(void) * directory we inherited from our parent process, which is a * directory we want to avoid removing. * - * For convience, we would like to have the path relative to the + * For convenience, we would like to have the path relative to the * worktree instead of an absolute path. * * Yes, startup_info->original_cwd is usually the same as 'prefix', From e61651b1a8fe5760baa6e09738b294a2ed0152f0 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:39 +0000 Subject: [PATCH 18/19] sideband: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- sideband.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sideband.c b/sideband.c index 5d8907151f..c62680181c 100644 --- a/sideband.c +++ b/sideband.c @@ -190,7 +190,7 @@ int demultiplex_sideband(const char *me, int status, int linelen = brk - b; /* - * For message accross packet boundary, there would have + * For message across packet boundary, there would have * a nonempty "scratch" buffer from last call of this * function, and there may have a leading CR/LF in "buf". * For this case we should add a clear-to-eol suffix to From e02cc08a88e7d0323391e68937e75c11e3e3cfef Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 19 Sep 2024 18:34:40 +0000 Subject: [PATCH 19/19] upload-pack: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- upload-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload-pack.c b/upload-pack.c index 0052c6a4dc..66dcfb604f 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1802,7 +1802,7 @@ int upload_pack_v2(struct repository *r, struct packet_reader *request) } else { /* * Request had 'want's but no 'have's so we can - * immedietly go to construct and send a pack. + * immediately go to construct and send a pack. */ state = FETCH_SEND_PACK; }