From patchwork Wed Oct 23 00:29:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cai via GitGitGadget X-Patchwork-Id: 11205575 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B34A91390 for ; Wed, 23 Oct 2019 00:29:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69C242086D for ; Wed, 23 Oct 2019 00:29:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TeMxUWF4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733017AbfJWA3o (ORCPT ); Tue, 22 Oct 2019 20:29:44 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38553 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727898AbfJWA3o (ORCPT ); Tue, 22 Oct 2019 20:29:44 -0400 Received: by mail-wm1-f65.google.com with SMTP id 3so17816884wmi.3 for ; Tue, 22 Oct 2019 17:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=uP382XaKMWaHtmPRK4PhaHccOQcMmvK8WMInXrWz8Xw=; b=TeMxUWF4ZZ6lu3eShmlrp+YGhHOSjXE8pdxpCoZwVRo+CJ4kV6oNFjHHUZL+6JbX/a 8b7P1afXU9FU/u4mCnIQ2N67wfhd1k6bcbCux6SQo8YbmbSMq9OwewTpJpbEVucu3uE6 C6SWHX9OxjNaeXAoqs8iKsSFsLRyIBZ3aDCln/rCOnS9GFemaNWJyY5abiPrljNDIyRn 50cugTX+Fx9EmRU8ivjpnfoROcjcM4FzslKNTIy578nQLgcnT3c1vtBNSY4fRo+UqZD1 H2LbRwe+kRRLKnXCq5zMUcwLKlvjskER9EttUGyVk2a+8hfoMvOXpMkAPhqYAdzlrpy7 sSTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=uP382XaKMWaHtmPRK4PhaHccOQcMmvK8WMInXrWz8Xw=; b=XXggm4ciZ4Utn9Mm4DY8Pi5YcEyLbn4Kj6OhXuKsp3VqFk9uAm/I7m8EA6DbFaDzoi roppiOzxGD4dCwMEzG8oU9NlPcPKdx/dVp7Gw4STJKQwvrCV1/04kbLv5Y6Ipjgn9FCL FSwCdZtt5hneeUmBM7cHBvT71zGXC3GPsXgYiH07dhbR6mSd2KrTeUwuCmYZJP3VKFJX XW7y2rTHZleabJUCv9tRzR7ERvHs2btfcHcgUDkOjeo4QM3/7WbyLyAgICAQ2wMhRKx5 JDh+KBV2lzk3UTJ2bZHidYSWJmNJrlRkTVAoO6ndhdg6ZyGu96HsiCxVm5ORoOXSB00f rkwA== X-Gm-Message-State: APjAAAXOzXvT2U1UO7dwF9SldOJ0tzwR2m/4pfrGNA4JsCV4YHGLCejQ Mp0sr1mIYpkM39emQpPCwb4DFevo X-Google-Smtp-Source: APXvYqzKcSK0ko1iYaUQ6JddX5LAFs7C+c2RJA4ASaGTPonLGrzBiXKg/UKENBDcwwQZIySlXWukRQ== X-Received: by 2002:a1c:7f54:: with SMTP id a81mr4877514wmd.48.1571790577032; Tue, 22 Oct 2019 17:29:37 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i18sm18507289wrx.14.2019.10.22.17.29.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Oct 2019 17:29:36 -0700 (PDT) Message-Id: <086a6bb7be8c06c64f1175c4de66a1437ffb3c48.1571790575.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Wed, 23 Oct 2019 00:29:34 +0000 Subject: [PATCH 1/1] Documentation: fix a bunch of typos, both old and new Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Signed-off-by: Elijah Newren --- Documentation/CodingGuidelines | 2 +- Documentation/RelNotes/1.7.0.2.txt | 2 +- Documentation/RelNotes/1.7.10.4.txt | 2 +- Documentation/RelNotes/1.7.12.3.txt | 2 +- Documentation/RelNotes/1.7.5.3.txt | 2 +- Documentation/RelNotes/1.8.0.txt | 2 +- Documentation/RelNotes/2.1.3.txt | 2 +- Documentation/RelNotes/2.10.0.txt | 2 +- Documentation/RelNotes/2.10.2.txt | 2 +- Documentation/RelNotes/2.11.1.txt | 2 +- Documentation/RelNotes/2.12.0.txt | 2 +- Documentation/RelNotes/2.13.3.txt | 4 ++-- Documentation/RelNotes/2.14.0.txt | 4 ++-- Documentation/RelNotes/2.16.0.txt | 2 +- Documentation/RelNotes/2.16.3.txt | 2 +- Documentation/RelNotes/2.17.0.txt | 2 +- Documentation/RelNotes/2.18.0.txt | 2 +- Documentation/RelNotes/2.19.0.txt | 2 +- Documentation/RelNotes/2.24.0.txt | 2 +- Documentation/RelNotes/2.3.3.txt | 2 +- Documentation/RelNotes/2.3.7.txt | 2 +- Documentation/RelNotes/2.4.3.txt | 2 +- Documentation/RelNotes/2.8.0.txt | 2 +- Documentation/RelNotes/2.9.3.txt | 2 +- Documentation/config/tag.txt | 2 +- Documentation/git-bisect-lk2009.txt | 2 +- Documentation/git-check-attr.txt | 2 +- Documentation/git-check-ignore.txt | 2 +- Documentation/git-filter-branch.txt | 2 +- Documentation/git-range-diff.txt | 2 +- Documentation/git-tag.txt | 2 +- Documentation/gitattributes.txt | 2 +- Documentation/gitmodules.txt | 2 +- Documentation/technical/api-trace2.txt | 14 +++++++------- Documentation/technical/commit-graph.txt | 12 ++++++------ .../technical/hash-function-transition.txt | 2 +- Documentation/technical/index-format.txt | 4 ++-- Documentation/technical/partial-clone.txt | 2 +- Documentation/technical/protocol-v2.txt | 2 +- Documentation/technical/rerere.txt | 2 +- 40 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index f45db5b727..d05a80fe9d 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -75,7 +75,7 @@ For shell scripts specifically (not exhaustive): - If you want to find out if a command is available on the user's $PATH, you should use 'type ', instead of 'which '. - The output of 'which' is not machine parseable and its exit code + The output of 'which' is not machine parsable and its exit code is not reliable across platforms. - We use POSIX compliant parameter substitutions and avoid bashisms; diff --git a/Documentation/RelNotes/1.7.0.2.txt b/Documentation/RelNotes/1.7.0.2.txt index fcb46ca6a4..73ed2b5278 100644 --- a/Documentation/RelNotes/1.7.0.2.txt +++ b/Documentation/RelNotes/1.7.0.2.txt @@ -34,7 +34,7 @@ Fixes since v1.7.0.1 * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series to speed up scanning of large working tree. - * "gitweb" did not diagnose parsing errors properly while reading tis configuration + * "gitweb" did not diagnose parsing errors properly while reading its configuration file. And other minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.10.4.txt b/Documentation/RelNotes/1.7.10.4.txt index 326670df6e..57597f2bf3 100644 --- a/Documentation/RelNotes/1.7.10.4.txt +++ b/Documentation/RelNotes/1.7.10.4.txt @@ -7,7 +7,7 @@ Fixes since v1.7.10.3 * The message file for Swedish translation has been updated a bit. * A name taken from mailmap was copied into an internal buffer - incorrectly and could overun the buffer if it is too long. + incorrectly and could overrun the buffer if it is too long. * A malformed commit object that has a header line chomped in the middle could kill git with a NULL pointer dereference. diff --git a/Documentation/RelNotes/1.7.12.3.txt b/Documentation/RelNotes/1.7.12.3.txt index ecda427a35..4b822976b8 100644 --- a/Documentation/RelNotes/1.7.12.3.txt +++ b/Documentation/RelNotes/1.7.12.3.txt @@ -25,7 +25,7 @@ Fixes since v1.7.12.2 its Accept-Encoding header. * "git receive-pack" (the counterpart to "git push") did not give - progress output while processing objects it received to the puser + progress output while processing objects it received to the user when run over the smart-http protocol. * "git status" honored the ignore=dirty settings in .gitmodules but diff --git a/Documentation/RelNotes/1.7.5.3.txt b/Documentation/RelNotes/1.7.5.3.txt index 9c03353af2..1d24edcf2f 100644 --- a/Documentation/RelNotes/1.7.5.3.txt +++ b/Documentation/RelNotes/1.7.5.3.txt @@ -22,7 +22,7 @@ Fixes since v1.7.5.2 * "git log --stdin path" with an input that has additional pathspec used to corrupt memory. - * "git send-pack" (hence "git push") over smalt-HTTP protocol could + * "git send-pack" (hence "git push") over smart-HTTP protocol could deadlock when the client side pack-object died early. * Compressed tarball gitweb generates used to be made with the timestamp diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt index 43883c14f0..63d6e4afa4 100644 --- a/Documentation/RelNotes/1.8.0.txt +++ b/Documentation/RelNotes/1.8.0.txt @@ -233,7 +233,7 @@ to them for details). together, misdetected branches. * "git receive-pack" (the counterpart to "git push") did not give - progress output while processing objects it received to the puser + progress output while processing objects it received to the user when run over the smart-http protocol. * When you misspell the command name you give to the "exec" action in diff --git a/Documentation/RelNotes/2.1.3.txt b/Documentation/RelNotes/2.1.3.txt index acc9ebb886..0dfb17c4fc 100644 --- a/Documentation/RelNotes/2.1.3.txt +++ b/Documentation/RelNotes/2.1.3.txt @@ -13,7 +13,7 @@ Git v2.1.3 Release Notes they are new enough to support the `--output` option. * "git pack-objects" forgot to disable the codepath to generate - object recheability bitmap when it needs to split the resulting + object reachability bitmap when it needs to split the resulting pack. * "gitweb" used deprecated CGI::startfrom, which was removed from diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index f4da28ab66..3792b7d03d 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -478,7 +478,7 @@ notes for details). * One part of "git am" had an oddball helper function that called stuff from outside "his" as opposed to calling what we have "ours", which was not gender-neutral and also inconsistent with the rest of - the system where outside stuff is usuall called "theirs" in + the system where outside stuff is usually called "theirs" in contrast to "ours". * "git blame file" allowed the lineage of lines in the uncommitted, diff --git a/Documentation/RelNotes/2.10.2.txt b/Documentation/RelNotes/2.10.2.txt index c4d4397023..abbd331508 100644 --- a/Documentation/RelNotes/2.10.2.txt +++ b/Documentation/RelNotes/2.10.2.txt @@ -86,7 +86,7 @@ Fixes since v2.10.1 by refusing to check out a branch that is already checked out in another worktree. However, this also prevented checking out a branch, which is designated as the primary branch of a bare - reopsitory, in a worktree that is connected to the bare + repository, in a worktree that is connected to the bare repository. The check has been corrected to allow it. * "git rebase" immediately after "git clone" failed to find the fork diff --git a/Documentation/RelNotes/2.11.1.txt b/Documentation/RelNotes/2.11.1.txt index 9cd14c8197..7d35cf186d 100644 --- a/Documentation/RelNotes/2.11.1.txt +++ b/Documentation/RelNotes/2.11.1.txt @@ -104,7 +104,7 @@ Fixes since v2.11 "git difftool --dir-diff" from a subdirectory never worked. This has been fixed. - * "git p4" that tracks multile p4 paths imported a single changelist + * "git p4" that tracks multiple p4 paths imported a single changelist that touches files in these multiple paths as one commit, followed by many empty commits. This has been fixed. diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt index ef8b97da9b..d2f6a83614 100644 --- a/Documentation/RelNotes/2.12.0.txt +++ b/Documentation/RelNotes/2.12.0.txt @@ -315,7 +315,7 @@ notes for details). "git difftool --dir-diff" from a subdirectory never worked. This has been fixed. - * "git p4" that tracks multile p4 paths imported a single changelist + * "git p4" that tracks multiple p4 paths imported a single changelist that touches files in these multiple paths as one commit, followed by many empty commits. This has been fixed. diff --git a/Documentation/RelNotes/2.13.3.txt b/Documentation/RelNotes/2.13.3.txt index 5d76ad5310..384e4de265 100644 --- a/Documentation/RelNotes/2.13.3.txt +++ b/Documentation/RelNotes/2.13.3.txt @@ -25,7 +25,7 @@ Fixes since v2.13.2 * The code to pick up and execute command alias definition from the configuration used to switch to the top of the working tree and then come back when the expanded alias was executed, which was - unnecessarilyl complex. Attempt to simplify the logic by using the + unnecessarily complex. Attempt to simplify the logic by using the early-config mechanism that does not chdir around. * "git add -p" were updated in 2.12 timeframe to cope with custom @@ -35,7 +35,7 @@ Fixes since v2.13.2 * Fix a recent regression to "git rebase -i" and add tests that would have caught it and others. - * An unaligned 32-bit access in pack-bitmap code ahs been corrected. + * An unaligned 32-bit access in pack-bitmap code has been corrected. * Tighten error checks for invalid "git apply" input. diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.txt index 4246c68ff5..2711a2529d 100644 --- a/Documentation/RelNotes/2.14.0.txt +++ b/Documentation/RelNotes/2.14.0.txt @@ -141,7 +141,7 @@ Performance, Internal Implementation, Development Support etc. * Some platforms have ulong that is smaller than time_t, and our historical use of ulong for timestamp would mean they cannot represent some timestamp that the platform allows. Invent a - separate and dedicated timestamp_t (so that we can distingiuish + separate and dedicated timestamp_t (so that we can distinguish timestamps and a vanilla ulongs, which along is already a good move), and then declare uintmax_t is the type to be used as the timestamp_t. @@ -442,7 +442,7 @@ notes for details). * The code to pick up and execute command alias definition from the configuration used to switch to the top of the working tree and then come back when the expanded alias was executed, which was - unnecessarilyl complex. Attempt to simplify the logic by using the + unnecessarily complex. Attempt to simplify the logic by using the early-config mechanism that does not chdir around. * Fix configuration codepath to pay proper attention to commondir diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt index 0c81c5915f..b474781ed8 100644 --- a/Documentation/RelNotes/2.16.0.txt +++ b/Documentation/RelNotes/2.16.0.txt @@ -407,7 +407,7 @@ Fixes since v2.15 (merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint). * Amending commits in git-gui broke the author name that is non-ascii - due to incorrect enconding conversion. + due to incorrect encoding conversion. * Recent update to the submodule configuration code broke "diff-tree" by accidentally stopping to read from the index upfront. diff --git a/Documentation/RelNotes/2.16.3.txt b/Documentation/RelNotes/2.16.3.txt index 64a0bcb0d2..f0121a8f2d 100644 --- a/Documentation/RelNotes/2.16.3.txt +++ b/Documentation/RelNotes/2.16.3.txt @@ -24,7 +24,7 @@ Fixes since v2.16.2 * The http tracing code, often used to debug connection issues, learned to redact potentially sensitive information from its output - so that it can be more safely sharable. + so that it can be more safely shareable. * Crash fix for a corner case where an error codepath tried to unlock what it did not acquire lock on. diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.txt index c2cf891f71..8b17c26033 100644 --- a/Documentation/RelNotes/2.17.0.txt +++ b/Documentation/RelNotes/2.17.0.txt @@ -216,7 +216,7 @@ Fixes since v2.16 * The http tracing code, often used to debug connection issues, learned to redact potentially sensitive information from its output - so that it can be more safely sharable. + so that it can be more safely shareable. (merge 8ba18e6fa4 jt/http-redact-cookies later to maint). * Crash fix for a corner case where an error codepath tried to unlock diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt index 3ea280cf68..6c8a0e97c1 100644 --- a/Documentation/RelNotes/2.18.0.txt +++ b/Documentation/RelNotes/2.18.0.txt @@ -179,7 +179,7 @@ Performance, Internal Implementation, Development Support etc. (merge 00a3da2a13 nd/remove-ignore-env-field later to maint). * Code to find the length to uniquely abbreviate object names based - on packfile content, which is a relatively recent addtion, has been + on packfile content, which is a relatively recent addition, has been optimized to use the same fan-out table. * The mechanism to use parse-options API to automate the command line diff --git a/Documentation/RelNotes/2.19.0.txt b/Documentation/RelNotes/2.19.0.txt index a06ccf6e2a..891c79b9cb 100644 --- a/Documentation/RelNotes/2.19.0.txt +++ b/Documentation/RelNotes/2.19.0.txt @@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc. * The conversion to pass "the_repository" and then "a_repository" throughout the object access API continues. - * Continuing with the idea to programatically enumerate various + * Continuing with the idea to programmatically enumerate various pieces of data required for command line completion, teach the codebase to report the list of configuration variables subcommands care about to help complete them. diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt index 4b442a9157..b1b6299a69 100644 --- a/Documentation/RelNotes/2.24.0.txt +++ b/Documentation/RelNotes/2.24.0.txt @@ -313,7 +313,7 @@ Fixes since v2.23 to access the worktree correctly, which has been corrected. (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint). - * The merge-recursive machiery is one of the most complex parts of + * The merge-recursive machinery is one of the most complex parts of the system that accumulated cruft over time. This large series cleans up the implementation quite a bit. (merge b657047719 en/merge-recursive-cleanup later to maint). diff --git a/Documentation/RelNotes/2.3.3.txt b/Documentation/RelNotes/2.3.3.txt index 5ef12644c2..850dc68ede 100644 --- a/Documentation/RelNotes/2.3.3.txt +++ b/Documentation/RelNotes/2.3.3.txt @@ -12,7 +12,7 @@ Fixes since v2.3.2 * Description given by "grep -h" for its --exclude-standard option was phrased poorly. - * Documentaton for "git remote add" mentioned "--tags" and + * Documentation for "git remote add" mentioned "--tags" and "--no-tags" and it was not clear that fetch from the remote in the future will use the default behaviour when neither is given to override it. diff --git a/Documentation/RelNotes/2.3.7.txt b/Documentation/RelNotes/2.3.7.txt index fc95812cb3..5769184081 100644 --- a/Documentation/RelNotes/2.3.7.txt +++ b/Documentation/RelNotes/2.3.7.txt @@ -4,7 +4,7 @@ Git v2.3.7 Release Notes Fixes since v2.3.6 ------------------ - * An earlier update to the parser that disects a URL broke an + * An earlier update to the parser that dissects a URL broke an address, followed by a colon, followed by an empty string (instead of the port number), e.g. ssh://example.com:/path/to/repo. diff --git a/Documentation/RelNotes/2.4.3.txt b/Documentation/RelNotes/2.4.3.txt index 914d2c1860..422e930aa2 100644 --- a/Documentation/RelNotes/2.4.3.txt +++ b/Documentation/RelNotes/2.4.3.txt @@ -66,7 +66,7 @@ Fixes since v2.4.3 * Some time ago, "git blame" (incorrectly) lost the convert_to_git() call when synthesizing a fake "tip" commit that represents the state in the working tree, which broke folks who record the history - with LF line ending to make their project portabile across + with LF line ending to make their project portable across platforms while terminating lines in their working tree files with CRLF for their platform. diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.txt index 5fbe1b86ee..27320b6a9f 100644 --- a/Documentation/RelNotes/2.8.0.txt +++ b/Documentation/RelNotes/2.8.0.txt @@ -189,7 +189,7 @@ Performance, Internal Implementation, Development Support etc. * Some calls to strcpy(3) triggers a false warning from static analyzers that are less intelligent than humans, and reducing the number of these false hits helps us notice real issues. A few - calls to strcpy(3) in a couple of protrams that are already safe + calls to strcpy(3) in a couple of programs that are already safe has been rewritten to avoid false warnings. * The "name_path" API was an attempt to reduce the need to construct diff --git a/Documentation/RelNotes/2.9.3.txt b/Documentation/RelNotes/2.9.3.txt index 695b86f612..305e08062b 100644 --- a/Documentation/RelNotes/2.9.3.txt +++ b/Documentation/RelNotes/2.9.3.txt @@ -36,7 +36,7 @@ Fixes since v2.9.2 * One part of "git am" had an oddball helper function that called stuff from outside "his" as opposed to calling what we have "ours", which was not gender-neutral and also inconsistent with the rest of - the system where outside stuff is usuall called "theirs" in + the system where outside stuff is usually called "theirs" in contrast to "ours". * The test framework learned a new helper test_match_signal to diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.txt index ef5adb3f42..6d9110d84c 100644 --- a/Documentation/config/tag.txt +++ b/Documentation/config/tag.txt @@ -13,7 +13,7 @@ tag.gpgSign:: Use of this option when running in an automated script can result in a large number of tags being signed. It is therefore convenient to use an agent to avoid typing your gpg passphrase - several times. Note that this option doesn't affects tag signing + several times. Note that this option doesn't affect tag signing behavior enabled by "-u " or "--local-user=" options. tar.umask:: diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt index e99925184d..2957bc5e0a 100644 --- a/Documentation/git-bisect-lk2009.txt +++ b/Documentation/git-bisect-lk2009.txt @@ -158,7 +158,7 @@ Test suites are very nice. But when they are used alone, they are supposed to be used so that all the tests are checked after each commit. This means that they are not very efficient, because many tests are run for no interesting result, and they suffer from -combinational explosion. +combinatorial explosion. In fact the problem is that big software often has many different configuration options and that each test case should pass for each diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt index 3c0578217b..84f41a8e82 100644 --- a/Documentation/git-check-attr.txt +++ b/Documentation/git-check-attr.txt @@ -32,7 +32,7 @@ OPTIONS instead of from the command-line. -z:: - The output format is modified to be machine-parseable. + The output format is modified to be machine-parsable. If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character. diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 8b42cb3fb2..8b2d49c79e 100644 --- a/Documentation/git-check-ignore.txt +++ b/Documentation/git-check-ignore.txt @@ -39,7 +39,7 @@ OPTIONS instead of from the command-line. -z:: - The output format is modified to be machine-parseable (see + The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character. diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 5876598852..59395b42df 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -534,7 +534,7 @@ repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as -git-filter-branch, it at least ameloriates the performance issues a +git-filter-branch, it at least ameliorates the performance issues a little. [[SAFETY]] diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt index 8a6ea2c6c5..006feb7ec1 100644 --- a/Documentation/git-range-diff.txt +++ b/Documentation/git-range-diff.txt @@ -242,7 +242,7 @@ corresponding. The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time -needed to compute the least-cost assigment between n and m diffs. Git +needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this: diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 2e5599a67f..f6d9791780 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -65,7 +65,7 @@ OPTIONS --sign:: Make a GPG-signed tag, using the default e-mail address's key. The default behavior of tag GPG-signing is controlled by `tag.gpgSign` - configuration variable if it exists, or disabled oder otherwise. + configuration variable if it exists, or disabled otherwise. See linkgit:git-config[1]. --no-sign:: diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index c5a528c667..39d15b7a16 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -498,7 +498,7 @@ command. This is achieved by using the long-running process protocol When Git encounters the first file that needs to be cleaned or smudged, it starts the filter and performs the handshake. In the handshake, the welcome message sent by Git is "git-filter-client", only version 2 is -suppported, and the supported capabilities are "clean", "smudge", and +supported, and the supported capabilities are "clean", "smudge", and "delay". Afterwards Git sends a list of "key=value" pairs terminated with diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index f2a65ba0ca..953c3876f0 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -81,7 +81,7 @@ submodule..ignore:: Committed differences and modifications to tracked files will show up. - none;; No modifiations to submodules are ignored, all of committed + none;; No modifications to submodules are ignored, all of committed differences, and modifications to tracked and untracked files are shown. This is the default option. diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt index a045dbe422..17490b528c 100644 --- a/Documentation/technical/api-trace2.txt +++ b/Documentation/technical/api-trace2.txt @@ -178,7 +178,7 @@ describe the simplified forms. == Public API -All Trace2 API functions send a messsage to all of the active +All Trace2 API functions send a message to all of the active Trace2 Targets. This section describes the set of available messages. @@ -377,7 +377,7 @@ of `pthread_create()`. and the thread elapsed time. + This function must be called by the thread-proc before it returns -(so that the coorect TLS data is used and cleaned up. It should +(so that the correct TLS data is used and cleaned up). It should not be called by the caller of `pthread_join()`. === Region and Data Messages @@ -406,7 +406,7 @@ The `label` field is an arbitrary label used to describe the activity being started, such as "read_recursive" or "do_read_index". + The `repo` field, if set, will be used to get the "repo-id", so that -recursive oerations can be attributed to the correct repository. +recursive operations can be attributed to the correct repository. `void trace2_region_leave(const char *category, const char *label, const struct repository *repo)`:: @@ -421,7 +421,7 @@ This function pops the region nesting stack on the current thread and reports the elapsed time of the stack frame. + The `category`, `label`, and `repo` fields are the same as above. -The `category` and `label` do not need to match the correpsonding +The `category` and `label` do not need to match the corresponding "region_enter" message, but it makes the data stream easier to understand. @@ -816,7 +816,7 @@ with "?". Note that the session-id of the child process is not available to the current/spawning process, so the child's PID is reported here as a hint for post-processing. (But it is only a hint because the child -proces may be a shell script which doesn't have a session-id.) +process may be a shell script which doesn't have a session-id.) + Note that the `t_rel` field contains the observed run time in seconds for the child process (starting before the fork/exec/spawn and @@ -1176,7 +1176,7 @@ d0 | main | atexit | | 0.028809 | | + Regions may be nested. This causes messages to be indented in the PERF target, for example. -Elapsed times are relative to the start of the correpsonding nesting +Elapsed times are relative to the start of the corresponding nesting level as expected. For example, if we add region message to: + ---------------- @@ -1371,7 +1371,7 @@ d0 | main | atexit | | 0.030027 | | In this example, the preload region took 0.009122 seconds. The 7 threads took between 0.006069 and 0.008947 seconds to work on their portion of the index. Thread "th01" worked on 508 items at offset 0. Thread "th02" -worked on 508 items at offset 2032. Thread "th04" worked on 508 itemts +worked on 508 items at offset 2032. Thread "th04" worked on 508 items at offset 508. + This example also shows that thread names are assigned in a racy manner diff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt index 729fbcb32f..1507117dc2 100644 --- a/Documentation/technical/commit-graph.txt +++ b/Documentation/technical/commit-graph.txt @@ -22,11 +22,11 @@ as "commit-graph" either in the .git/objects/info directory or in the info directory of an alternate. The commit-graph file stores the commit graph structure along with some -extra metadata to speed up graph walks. By listing commit OIDs in lexi- -cographic order, we can identify an integer position for each commit and -refer to the parents of a commit using those integer positions. We use -binary search to find initial commits and then use the integer positions -for fast lookups during the walk. +extra metadata to speed up graph walks. By listing commit OIDs in +lexicographic order, we can identify an integer position for each commit +and refer to the parents of a commit using those integer positions. We +use binary search to find initial commits and then use the integer +positions for fast lookups during the walk. A consumer may load the following info for a commit from the graph: @@ -85,7 +85,7 @@ have generation number represented by the macro GENERATION_NUMBER_ZERO = 0. Since the commit-graph file is closed under reachability, we can guarantee the following weaker condition on all commits: - If A and B are commits with generation numbers N amd M, respectively, + If A and B are commits with generation numbers N and M, respectively, and N < M, then A cannot reach B. Note how the strict inequality differs from the inequality when we have diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt index 2ae8fa470a..5fe8ed1bf3 100644 --- a/Documentation/technical/hash-function-transition.txt +++ b/Documentation/technical/hash-function-transition.txt @@ -602,7 +602,7 @@ git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256} Choice of Hash -------------- -In early 2005, around the time that Git was written, Xiaoyun Wang, +In early 2005, around the time that Git was written, Xiaoyun Wang, Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1 collisions in 2^69 operations. In August they published details. Luckily, no practical demonstrations of a collision in full SHA-1 were diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt index 7c4d67aa6a..faa25c5c52 100644 --- a/Documentation/technical/index-format.txt +++ b/Documentation/technical/index-format.txt @@ -318,7 +318,7 @@ The remaining data of each directory block is grouped by type: == End of Index Entry The End of Index Entry (EOIE) is used to locate the end of the variable - length index entries and the begining of the extensions. Code can take + length index entries and the beginning of the extensions. Code can take advantage of this to quickly locate the index extensions without having to parse through all of the index entries. @@ -351,7 +351,7 @@ The remaining data of each directory block is grouped by type: - A number of index offset entries each consisting of: - - 32-bit offset from the begining of the file to the first cache entry + - 32-bit offset from the beginning of the file to the first cache entry in this block of entries. - 32-bit count of cache entries in this block diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt index 210373e258..a6034d5610 100644 --- a/Documentation/technical/partial-clone.txt +++ b/Documentation/technical/partial-clone.txt @@ -32,7 +32,7 @@ if/when needed. A remote that can later provide the missing objects is called a promisor remote, as it promises to send the objects when -requested. Initialy Git supported only one promisor remote, the origin +requested. Initially Git supported only one promisor remote, the origin remote from which the user cloned and that was configured in the "extensions.partialClone" config option. Later support for more than one promisor remote has been implemented. diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt index 40f91f6b1e..7e3766cafb 100644 --- a/Documentation/technical/protocol-v2.txt +++ b/Documentation/technical/protocol-v2.txt @@ -252,7 +252,7 @@ A `fetch` request can take the following arguments: ofs-delta Indicate that the client understands PACKv2 with delta referring to its base by position in pack rather than by an oid. That is, - they can read OBJ_OFS_DELTA (ake type 6) in a packfile. + they can read OBJ_OFS_DELTA (aka type 6) in a packfile. If the 'shallow' feature is advertised the following arguments can be included in the clients request as well as the potential addition of the diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt index aa22d7ace8..af5f9fc24f 100644 --- a/Documentation/technical/rerere.txt +++ b/Documentation/technical/rerere.txt @@ -117,7 +117,7 @@ early A became C or B, a late X became Y or Z". We can see there are 4 combinations of ("B or C", "C or B") x ("X or Y", "Y or X"). By sorting, the conflict is given its canonical name, namely, "an -early part became B or C, a late part becames X or Y", and whenever +early part became B or C, a late part became X or Y", and whenever any of these four patterns appear, and we can get to the same conflict and resolution that we saw earlier. From patchwork Tue Nov 5 17:07:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cai via GitGitGadget X-Patchwork-Id: 11228295 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 65CC416B1 for ; Tue, 5 Nov 2019 17:07:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41EC02087E for ; Tue, 5 Nov 2019 17:07:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eaBcbn+m" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388979AbfKERHj (ORCPT ); Tue, 5 Nov 2019 12:07:39 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:32927 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388177AbfKERHj (ORCPT ); Tue, 5 Nov 2019 12:07:39 -0500 Received: by mail-wr1-f65.google.com with SMTP id s1so22365442wro.0 for ; Tue, 05 Nov 2019 09:07:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=KclAhPavntM2sDuE/cp2Hmb4f0D9F4zQzkAxBPIN5XQ=; b=eaBcbn+m6ISQCSq4fZL3/svcQOZuz5ocA6o8CMDU0Bt/D1S0hey+hAAtJSaRTNSTE3 cOyt7ex4mzEWDeWlsQckEdfVvylBtkdcwoIhpFeUIkWKTuvVV5oRQqJWVdR4WQcUBBl+ 2CY5MykIA2rdiDcJzdU8E5MR+CFxn4XhwW2n5Ywzv362IG76Yg67y4YwZ64zjnRAkFWL 6MyYlz8bqlfkfIR/EHc44nEPKCa+bSMTSU3bsFP/iaEY77H/xlomRQhRG7FnhzZOEOYC qO3RgVXs/RkhFmQRY3SQxobjx2QvVCcxq8UTtvKgCmQXSZulmN5AQRUNWpevmnWj2wg+ yFmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=KclAhPavntM2sDuE/cp2Hmb4f0D9F4zQzkAxBPIN5XQ=; b=aGFM8b29b6xQ/MgGDB6qe4ivRoA4HiLzOFkx8tL4VngEMvb7I55nOttykVCYuWBDe7 6HqFSPAaqqi/pqGkI7bNImrGu4RVdoALjb1Es1QnejWG7aUYVl9X5GHV3RQqWGPBGPOO +GxuF4EZV62TVygyus6zplnNiZbvVjW5PXPmL8LvrP6GW0ZA3hJabpbZ+7bO3m3NmRpB DGebUO9s22kM2btwp20LVsIEmL4uXWoa5gORGADpDUMicIJ+SNkSqF8xhP0YdwPtbOj/ B2fuLI3VTl+gsFPSJiyXIVg9aZHkTfSkXkNvceguCI5UsqV+xXD1GPnOJdl7+kKIZcwt O1KA== X-Gm-Message-State: APjAAAXp/HRhwGom+W8WtOLI3kt4+8hBzsulyKIl3mzh0GXJ5d711k66 N5pjctS3+WgfDAnUNtGW0lx43PcV X-Google-Smtp-Source: APXvYqwC0EwsvRmAVBweM29bLh5j1Knz6mYijNIDBBjwf5JaSjGihPjNpJyozLkMH+kyn3sPk429vA== X-Received: by 2002:a5d:54cb:: with SMTP id x11mr29641262wrv.161.1572973656533; Tue, 05 Nov 2019 09:07:36 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 36sm42193429wrj.42.2019.11.05.09.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 09:07:36 -0800 (PST) Message-Id: <812c36a6d418276bade9860c083c7d32b158496a.1572973651.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Tue, 05 Nov 2019 17:07:21 +0000 Subject: [PATCH v2 02/11] Fix spelling errors in documentation outside of Documentation/ Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Reported-by: Jens Schleusener Signed-off-by: Elijah Newren --- INSTALL | 2 +- contrib/hooks/update-paranoid | 2 +- perl/Git.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index c39006e8e7..e7ff0a82b6 100644 --- a/INSTALL +++ b/INSTALL @@ -109,7 +109,7 @@ Issues of note: - Git is reasonably self-sufficient, but does depend on a few external programs and libraries. Git can be used without most of them by adding - the approriate "NO_=YesPlease" to the make command line or + the appropriate "NO_=YesPlease" to the make command line or config.mak file. - "zlib", the compression library. Git won't build without it. diff --git a/contrib/hooks/update-paranoid b/contrib/hooks/update-paranoid index d18b317b2f..0092d67b8a 100755 --- a/contrib/hooks/update-paranoid +++ b/contrib/hooks/update-paranoid @@ -49,7 +49,7 @@ opcode. Repository sections are matched on the basename of the repository (after removing the .git suffix). -The opcode abbrevations are: +The opcode abbreviations are: C: create new ref D: delete existing ref diff --git a/perl/Git.pm b/perl/Git.pm index 62c472e0ce..54c9ed0dde 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -563,7 +563,7 @@ sub get_record { Query user C and return answer from user. Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying -the user. If no *_ASKPASS variable is set or an error occoured, +the user. If no *_ASKPASS variable is set or an error occurred, the terminal is tried as a fallback. If C is set and true, the terminal disables echo. From patchwork Tue Nov 5 17:07:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cai via GitGitGadget X-Patchwork-Id: 11228297 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FE8B1864 for ; Tue, 5 Nov 2019 17:07:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E8772087E for ; Tue, 5 Nov 2019 17:07:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="q3J5hjRz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390337AbfKERHk (ORCPT ); Tue, 5 Nov 2019 12:07:40 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:34478 "EHLO mail-wr1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388711AbfKERHk (ORCPT ); Tue, 5 Nov 2019 12:07:40 -0500 Received: by mail-wr1-f42.google.com with SMTP id e6so20466466wrw.1 for ; Tue, 05 Nov 2019 09:07:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=jxoXBzB1x08/8OJLbYp766dFyF2d9HXNSiWvQ4o4gBY=; b=q3J5hjRzLMNt2tZLgXytKipjTZL/9PUma0bcLMdvJZgfTzey3ze1Y0j8q2dlbC29pk 1gUFrlNY/Wlf0MnLb9yDWx9EICCYmvMe5y1HQMnbJmtEc1UZzGiQjuZmBIXcghalpmI4 anKU7/eGaUtsXLGYhbVcQfMxLBaURZaEN4zlFGzj8EmujmwAaRkTkQUeZiOjbTGHUpXz AVmTLCj6/OGWXw1i57ECD0UkFs7SKex71ytIeIpKb3cPr4H58k8gJouRAxhVP/Hfc4fg 13UaWUvqTupa7HT/iBK8HFbqYLbwUqPUvp6915OyOOzuJtpRpVwMDB+3IDsANzaf91wt bFyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=jxoXBzB1x08/8OJLbYp766dFyF2d9HXNSiWvQ4o4gBY=; b=GlnVWt1a41uYYNWvnj656Pzt7GREcxVqg4CXWlenai4V9u1i1tghqCS5CYhckepqes 6WW2sSUgvntv1GYsX2noioqMg6Vi2skemACy/5qdEDGXmn3jf6ad35RfpY5GWwexjdeX MKMCsIkJZGfhGRITra0SSaKbLf70afzkVEYdh9qonTYVj/ii3BX2SjdgCXSNWDFiBeCe 0Zf3GipWxhiscdivJp1IEMEZ1S4esw3WQ0kr7Bon9TKjpdyd04RkMG4wuCX3xJkwShTm wM2MAQX58MdFpsUCLTNnwiLuPxPwMroQMvl/8PS3/VjdgxPj9pOT/Exx3HETmPEKZjPz hZlQ== X-Gm-Message-State: APjAAAVBEs8DaAqRy/DutDxUD7Ww5f2jXHnl+mroVlrC8sHLBYbfkxci epNfpEzWXS/QazIk7Te3eKDjWptS X-Google-Smtp-Source: APXvYqymxnBpZxcIWarHMRUScxZNWRIBv2sHEUJjz2rP6Wc3xU02b4YCY2VTaq8nSDD4V5tLq3WZ4A== X-Received: by 2002:a5d:634b:: with SMTP id b11mr30560123wrw.13.1572973657295; Tue, 05 Nov 2019 09:07:37 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t5sm9701718wro.76.2019.11.05.09.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 09:07:36 -0800 (PST) Message-Id: <466aead9af6516ff94a5d217e58ab894e63088b7.1572973651.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Tue, 05 Nov 2019 17:07:22 +0000 Subject: [PATCH v2 03/11] Prefer 'up-to-date' spelling Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren When we are providing an English error message for users, we should avoid 'uptodate'. According to https://writingexplained.org/up-to-date-hyphenated, when used as an adjective (i.e. when used as a synonym for 'current') -- which matches our usage -- the correct spelling is up-to-date. (Alternatively, when used as an adverb, the same page points out it is spelled 'up to date'.) In either case, when providing an English error message for users, we shouldn't use 'uptodate'. Correct the spelling. Reported-by: Jens Schleusener Signed-off-by: Elijah Newren --- builtin/fetch.c | 2 +- gitk-git/gitk | 2 +- t/t7110-reset-merge.sh | 4 ++-- t/t7609-merge-co-error-msgs.sh | 2 +- unpack-trees.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 863c858fde..d597fa5be0 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -604,7 +604,7 @@ static void adjust_refcol_width(const struct ref *ref) { int max, rlen, llen, len; - /* uptodate lines are only shown on high verbosity level */ + /* up-to-date lines are only shown on high verbosity level */ if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid)) return; diff --git a/gitk-git/gitk b/gitk-git/gitk index abe4805ade..50a5b60c13 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -9696,7 +9696,7 @@ proc cherrypick {} { if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} { notbusy cherrypick if {[regexp -line \ - {Entry '(.*)' (would be overwritten by merge|not uptodate)} \ + {Entry '(.*)' (would be overwritten by merge|not up-to-date)} \ $err msg fname]} { error_popup [mc "Cherry-pick failed because of local changes\ to file '%s'.\nPlease commit, reset or stash\ diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh index a82a07a04a..d81a27f3b0 100755 --- a/t/t7110-reset-merge.sh +++ b/t/t7110-reset-merge.sh @@ -173,7 +173,7 @@ test_expect_success 'reset --merge fails with changes in file it touches' ' sed -e "s/line 1/changed line 1/" file3 && mv file3 file1 && test_must_fail git reset --merge HEAD^ 2>err.log && - grep file1 err.log | grep "not uptodate" + grep file1 err.log | grep "not up-to-date" ' # The next test will test the following: @@ -189,7 +189,7 @@ test_expect_success 'reset --keep fails with changes in file it touches' ' sed -e "s/line 1/changed line 1/" file3 && mv file3 file1 && test_must_fail git reset --keep HEAD^ 2>err.log && - grep file1 err.log | grep "not uptodate" + grep file1 err.log | grep "not up-to-date" ' test_expect_success 'setup 3 different branches' ' diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index e90413204e..111253ae5d 100755 --- a/t/t7609-merge-co-error-msgs.sh +++ b/t/t7609-merge-co-error-msgs.sh @@ -98,7 +98,7 @@ Please commit your changes or stash them before you switch branches. Aborting EOF -test_expect_success 'not uptodate file porcelain checkout error' ' +test_expect_success 'not up-to-date file porcelain checkout error' ' git add rep/one rep/two && test_must_fail git checkout branch 2>out && test_i18ncmp out expect diff --git a/unpack-trees.c b/unpack-trees.c index 33ea7810d8..8ba2dc3267 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -29,7 +29,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { "Entry '%s' would be overwritten by merge. Cannot merge.", /* ERROR_NOT_UPTODATE_FILE */ - "Entry '%s' not uptodate. Cannot merge.", + "Entry '%s' not up-to-date. Cannot merge.", /* ERROR_NOT_UPTODATE_DIR */ "Updating '%s' would lose untracked files in it", @@ -44,7 +44,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { "Entry '%s' overlaps with '%s'. Cannot bind.", /* ERROR_SPARSE_NOT_UPTODATE_FILE */ - "Entry '%s' not uptodate. Cannot update sparse checkout.", + "Entry '%s' not up-to-date. Cannot update sparse checkout.", /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ "Working tree file '%s' would be overwritten by sparse checkout update.", @@ -2027,7 +2027,7 @@ static int merged_entry(const struct cache_entry *ce, } else if (!(old->ce_flags & CE_CONFLICTED)) { /* * See if we can re-use the old CE directly? - * That way we get the uptodate stat info. + * That way we get the up-to-date stat info. * * This also removes the UPDATE flag on a match; otherwise * we will end up overwriting local changes in the work tree. From patchwork Tue Nov 5 17:07:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cai via GitGitGadget X-Patchwork-Id: 11228301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D18E61986 for ; Tue, 5 Nov 2019 17:07:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9262C20656 for ; Tue, 5 Nov 2019 17:07:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NEzpkZ5l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390348AbfKERHm (ORCPT ); Tue, 5 Nov 2019 12:07:42 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:50231 "EHLO mail-wm1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388177AbfKERHl (ORCPT ); Tue, 5 Nov 2019 12:07:41 -0500 Received: by mail-wm1-f50.google.com with SMTP id 11so106436wmk.0 for ; Tue, 05 Nov 2019 09:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=cghIAECVa7UHcNV2CAM+pPVRuC28dQFDn7U/NiCrpN8=; b=NEzpkZ5l3nqYCNzOeMOZcYygmEPDcH6m9/WkZMWAjazjlQgQkmShX7aaPdxofGpz4l e/Ums+pweRXd5lLmIfDfPDThH1m9PABDD+XRVihnImsDBk8uld1P19X5w9ulHkCBiURe SFIzUXn1bU5H0CSumNk+/blHNFu/ej46quDeMB0a3NWPxExtiI9h1T0qYixDTH78L7iT gODGJjQgsB5gMMJnNfk5wP7fQOcLvpfRJuL7su0ftez3Uz8PPzhTR3c2dd1GaX+GMEWq NZ2TvLKf6sKiGETDIjsfkL6sPTXtcVY7URBrtDBuSBhhsha724+uvpMc8iklGZwRqFX6 GYJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=cghIAECVa7UHcNV2CAM+pPVRuC28dQFDn7U/NiCrpN8=; b=Eqk6Sce1/QRp1/f2wwyUZKjF1UrrgKm3bsB2XTLq5jUNMt7NTK6bKdlrJ2Bwckw/fU nFriRbdlR+AsTpve80VxI1yn8Bn2YqM+dy/mp3SAaZu99dIUEKjCCAKi8crFmi26PQyy 4ORFASFPTR2ZQaMrRgqr6pgOBrt/sws17HvjXfZ1CVweo5bNqE6OBuX0S5rOotpduJRf eAl1K3GL0U4dGUUSZS0yhUWhqD0MWQkL2sI/yU14+9Q8Io8ZxnVcbxqacAuujFumobmi cDXg4jYUhBYi0DVG7pVUGP9WjokHmOAExT2KAEf8g88ohEoJrvP4gSoK6sFQR6osczyA twQg== X-Gm-Message-State: APjAAAUID/8DZRUBOY7bWQHvbFB+HezWOu4zZbLisbXeFDH7ERFxjSBt NzTq7zUIh9UStHfTqXg13VfHXQSb X-Google-Smtp-Source: APXvYqyLFWdhNYjT9KTmOiI3MGBAFlL2yYlCZHj7b0PQdl4CWnNx5NA4SNUd7Fi4DbgXCvTfOUJK8g== X-Received: by 2002:a1c:9e4c:: with SMTP id h73mr17184wme.1.1572973658250; Tue, 05 Nov 2019 09:07:38 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 16sm446396wmf.0.2019.11.05.09.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 09:07:37 -0800 (PST) Message-Id: <3f2f8e9a70024db0820c3eba080f2e0db93841ec.1572973651.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Tue, 05 Nov 2019 17:07:23 +0000 Subject: [PATCH v2 04/11] Fix spelling errors in code comments Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Reported-by: Jens Schleusener Signed-off-by: Elijah Newren --- apply.c | 4 ++-- builtin/fetch.c | 2 +- builtin/gc.c | 4 ++-- builtin/pack-objects.c | 2 +- commit-graph.c | 2 +- commit.h | 2 +- compat/mingw.h | 2 +- compat/vcbuild/find_vs_env.bat | 2 +- configure.ac | 2 +- contrib/coccinelle/commit.cocci | 2 +- contrib/completion/git-completion.bash | 4 ++-- contrib/hooks/post-receive-email | 2 +- convert.c | 2 +- daemon.c | 4 ++-- diff.c | 4 ++-- dir.c | 2 +- git-send-email.perl | 2 +- gitweb/gitweb.perl | 18 +++++++++--------- hashmap.c | 2 +- hashmap.h | 2 +- name-hash.c | 2 +- parse-options.c | 2 +- range-diff.h | 2 +- read-cache.c | 2 +- refs/refs-internal.h | 2 +- repository.c | 4 ++-- repository.h | 2 +- rerere.c | 2 +- sequencer.c | 6 +++--- server-info.c | 2 +- string-list.h | 2 +- trace2/tr2_sid.c | 2 +- unpack-trees.c | 4 ++-- url.c | 2 +- xdiff-interface.h | 2 +- 35 files changed, 52 insertions(+), 52 deletions(-) diff --git a/apply.c b/apply.c index f8a046a6a5..bd80eefad0 100644 --- a/apply.c +++ b/apply.c @@ -4183,8 +4183,8 @@ static void show_rename_copy(struct patch *p) old_name = slash_old + 1; new_name = slash_new + 1; } - /* p->old_name thru old_name is the common prefix, and old_name and new_name - * through the end of names are renames + /* p->old_name through old_name is the common prefix, and old_name and + * new_name through the end of names are renames */ if (old_name != p->old_name) printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy, diff --git a/builtin/fetch.c b/builtin/fetch.c index d597fa5be0..93d378c72f 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1400,7 +1400,7 @@ static int do_fetch(struct transport *transport, /* * We're setting the upstream configuration for the - * current branch. The relevent upstream is the + * current branch. The relevant upstream is the * fetched branch that is meant to be merged with the * current one, i.e. the one fetched to FETCH_HEAD. * diff --git a/builtin/gc.c b/builtin/gc.c index fadb45489f..3f76bf4aa7 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -458,7 +458,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid) /* * Returns 0 if there was no previous error and gc can proceed, 1 if * gc should not proceed due to an error in the last run. Prints a - * message and returns -1 if an error occured while reading gc.log + * message and returns -1 if an error occurred while reading gc.log */ static int report_last_gc_error(void) { @@ -601,7 +601,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (detach_auto) { int ret = report_last_gc_error(); if (ret < 0) - /* an I/O error occured, already reported */ + /* an I/O error occurred, already reported */ exit(128); if (ret == 1) /* Last gc --auto failed. Skip this one. */ diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 5876583220..393c20a2d7 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -163,7 +163,7 @@ static void *get_delta(struct object_entry *entry) delta_buf = diff_delta(base_buf, base_size, buf, size, &delta_size, 0); /* - * We succesfully computed this delta once but dropped it for + * We successfully computed this delta once but dropped it for * memory reasons. Something is very wrong if this time we * recompute and create a different delta. */ diff --git a/commit-graph.c b/commit-graph.c index 0aea7b2ae5..3eb9bcdc8e 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -464,7 +464,7 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir) /* * Return 1 if commit_graph is non-NULL, and 0 otherwise. * - * On the first invocation, this function attemps to load the commit + * On the first invocation, this function attempts to load the commit * graph if the_repository is configured to have one. */ static int prepare_commit_graph(struct repository *r) diff --git a/commit.h b/commit.h index f5295ca7f3..221cdaa34b 100644 --- a/commit.h +++ b/commit.h @@ -132,7 +132,7 @@ const void *repo_get_commit_buffer(struct repository *r, #endif /* - * Tell the commit subsytem that we are done with a particular commit buffer. + * Tell the commit subsystem that we are done with a particular commit buffer. * The commit and buffer should be the input and return value, respectively, * from an earlier call to get_commit_buffer. The buffer may or may not be * freed by this call; callers should not access the memory afterwards. diff --git a/compat/mingw.h b/compat/mingw.h index 9ad204c57c..1a46334399 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -558,7 +558,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen); /* * A critical section used in the implementation of the spawn - * functions (mingw_spawnv[p]e()) and waitpid(). Intialised in + * functions (mingw_spawnv[p]e()) and waitpid(). Initialised in * the replacement main() macro below. */ extern CRITICAL_SECTION pinfo_cs; diff --git a/compat/vcbuild/find_vs_env.bat b/compat/vcbuild/find_vs_env.bat index 40194dd230..b35d264c0e 100644 --- a/compat/vcbuild/find_vs_env.bat +++ b/compat/vcbuild/find_vs_env.bat @@ -18,7 +18,7 @@ REM and MAKE, we must blend these two different worlds. This script REM attempts to do that. REM ================================================================ REM This BAT file starts in a plain (non-developer) command prompt, -REM searches for the "best" commmand prompt setup script, installs +REM searches for the "best" command prompt setup script, installs REM it into the current CMD process, and exports the various MSVC REM environment variables for use by MAKE. REM diff --git a/configure.ac b/configure.ac index a43b476402..4d32d5e432 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ AC_DEFUN([GIT_PARSE_WITH], # GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT) # ----------------------------------------------------- -# Set VAR to the value specied by --with-WITHNAME. +# Set VAR to the value specified by --with-WITHNAME. # No verification of arguments is performed, but warnings are issued # if either 'yes' or 'no' is specified. # HELP_TEXT is presented when --help is called. diff --git a/contrib/coccinelle/commit.cocci b/contrib/coccinelle/commit.cocci index d03453341e..778e4704f6 100644 --- a/contrib/coccinelle/commit.cocci +++ b/contrib/coccinelle/commit.cocci @@ -20,7 +20,7 @@ expression s; + set_commit_tree(c, s) ...>} -// These excluded functions must access c->maybe_tree direcly. +// These excluded functions must access c->maybe_tree directly. // Note that if c->maybe_tree is written somewhere outside of these // functions, then the recommended transformation will be bogus with // repo_get_commit_tree() on the LHS. diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 00fbe6c03d..47c551091f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -550,7 +550,7 @@ __git_index_files () esc_idx, 1) } else if (esc == "n") { # Uh-oh, a newline character. - # We cant reliably put a pathname + # We cannot reliably put a pathname # containing a newline into COMPREPLY, # and the newline would create a mess. # Skip this path. @@ -565,7 +565,7 @@ __git_index_files () } } # Drop closing double quote, if there is one. - # (There isnt any if this is a directory, as it was + # (There is not any if this is a directory, as it was # already stripped with the trailing path components.) if (substr(p, length(p), 1) == "\"") out = out substr(p, 1, length(p) - 1) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 8747b84334..ff565eb3d8 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -329,7 +329,7 @@ generate_update_branch_email() # # git rev-parse --not --all | grep -v $(git rev-parse $refname) # - # Get's us to something pretty safe (apart from the small time + # Gets us to something pretty safe (apart from the small time # between refname being read, and git rev-parse running - for that, # I give up) # diff --git a/convert.c b/convert.c index 25ac525d5f..8f670085fd 100644 --- a/convert.c +++ b/convert.c @@ -418,7 +418,7 @@ static int encode_to_git(const char *path, const char *src, size_t src_len, if (!dst) { /* * We could add the blob "as-is" to Git. However, on checkout - * we would try to reencode to the original encoding. This + * we would try to re-encode to the original encoding. This * would fail and we would leave the user with a messed-up * working tree. Let's try to avoid this by screaming loud. */ diff --git a/daemon.c b/daemon.c index 9d2e0d20ef..fd669ed3b4 100644 --- a/daemon.c +++ b/daemon.c @@ -598,7 +598,7 @@ static void canonicalize_client(struct strbuf *out, const char *in) * Read the host as supplied by the client connection. * * Returns a pointer to the character after the NUL byte terminating the host - * arguemnt, or 'extra_args' if there is no host arguemnt. + * argument, or 'extra_args' if there is no host argument. */ static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen) { @@ -652,7 +652,7 @@ static void parse_extra_args(struct hostinfo *hi, struct argv_array *env, * service that will be run. * * If there ends up being a particular arg in the future that - * git-daemon needs to parse specificly (like the 'host' arg) + * git-daemon needs to parse specifically (like the 'host' arg) * then it can be parsed here and not added to 'git_protocol'. */ if (*arg) { diff --git a/diff.c b/diff.c index afe4400a60..087213466e 100644 --- a/diff.c +++ b/diff.c @@ -2551,7 +2551,7 @@ static int scale_linear(int it, int width, int max_change) /* * make sure that at least one '-' or '+' is printed if * there is any change to this path. The easiest way is to - * scale linearly as if the alloted width is one column shorter + * scale linearly as if the allotted width is one column shorter * than it is, and then add 1 to the result. */ return 1 + (it * (width - 1) / max_change); @@ -3196,7 +3196,7 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l for (cnt = 1; cnt < marker_size; cnt++) if (line[cnt] != firstchar) return 0; - /* line[1] thru line[marker_size-1] are same as firstchar */ + /* line[1] through line[marker_size-1] are same as firstchar */ if (len < marker_size + 1 || !isspace(line[marker_size])) return 0; return 1; diff --git a/dir.c b/dir.c index 61f559f980..9047373f6b 100644 --- a/dir.c +++ b/dir.c @@ -2489,7 +2489,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) * wanted anyway */ continue; - /* fall thru */ + /* fall through */ } else if (S_ISDIR(st.st_mode)) { if (!remove_dir_recurse(path, flag, &kept_down)) continue; /* happy */ diff --git a/git-send-email.perl b/git-send-email.perl index 5f92c89c1c..dc95656f75 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1228,7 +1228,7 @@ sub process_address_list { # domain name that corresponds the IP address in the HELO/EHLO # handshake. This is used to verify the connection and prevent # spammers from trying to hide their identity. If the DNS and IP don't -# match, the receiveing MTA may deny the connection. +# match, the receiving MTA may deny the connection. # # Here is a deny example of Net::SMTP with the default "localhost.localdomain" # diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7fef19fe59..3d063e2155 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1657,15 +1657,15 @@ sub quot_cec { my $cntrl = shift; my %opts = @_; my %es = ( # character escape codes, aka escape sequences - "\t" => '\t', # tab (HT) - "\n" => '\n', # line feed (LF) - "\r" => '\r', # carrige return (CR) - "\f" => '\f', # form feed (FF) - "\b" => '\b', # backspace (BS) - "\a" => '\a', # alarm (bell) (BEL) - "\e" => '\e', # escape (ESC) - "\013" => '\v', # vertical tab (VT) - "\000" => '\0', # nul character (NUL) + "\t" => '\t', # tab (HT) + "\n" => '\n', # line feed (LF) + "\r" => '\r', # carriage return (CR) + "\f" => '\f', # form feed (FF) + "\b" => '\b', # backspace (BS) + "\a" => '\a', # alarm (bell) (BEL) + "\e" => '\e', # escape (ESC) + "\013" => '\v', # vertical tab (VT) + "\000" => '\0', # nul character (NUL) ); my $chr = ( (exists $es{$cntrl}) ? $es{$cntrl} diff --git a/hashmap.c b/hashmap.c index 39c13110bc..09813e1a46 100644 --- a/hashmap.c +++ b/hashmap.c @@ -51,7 +51,7 @@ unsigned int memihash(const void *buf, size_t len) } /* - * Incoporate another chunk of data into a memihash + * Incorporate another chunk of data into a memihash * computation. */ unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len) diff --git a/hashmap.h b/hashmap.h index bd2701549f..4e03c3ebde 100644 --- a/hashmap.h +++ b/hashmap.h @@ -502,7 +502,7 @@ static inline void hashmap_disable_item_counting(struct hashmap *map) } /* - * Re-enable item couting when adding/removing items. + * Re-enable item counting when adding/removing items. * If counting is currently disabled, it will force count them. * It WILL NOT automatically rehash them. */ diff --git a/name-hash.c b/name-hash.c index ceb1d7bd6f..d4fa6ba15f 100644 --- a/name-hash.c +++ b/name-hash.c @@ -138,7 +138,7 @@ static int lazy_nr_dir_threads; /* * Set a minimum number of cache_entries that we will handle per - * thread and use that to decide how many threads to run (upto + * thread and use that to decide how many threads to run (up to * the number on the system). * * For guidance setting the lower per-thread bound, see: diff --git a/parse-options.c b/parse-options.c index b42f54d48b..60fae3ad21 100644 --- a/parse-options.c +++ b/parse-options.c @@ -623,7 +623,7 @@ static int show_gitcomp(const struct option *opts) * Scan and may produce a new option[] array, which should be used * instead of the original 'options'. * - * Right now this is only used to preprocess and substitue + * Right now this is only used to preprocess and substitute * OPTION_ALIAS. */ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx, diff --git a/range-diff.h b/range-diff.h index 08a50b6e98..77347a9f88 100644 --- a/range-diff.h +++ b/range-diff.h @@ -6,7 +6,7 @@ #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 /* - * Compare series of commmits in RANGE1 and RANGE2, and emit to the + * Compare series of commits in RANGE1 and RANGE2, and emit to the * standard output. NULL can be passed to DIFFOPT to use the built-in * default. */ diff --git a/read-cache.c b/read-cache.c index 133f790fa4..06744287a1 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1790,7 +1790,7 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool, const unsigned char *cp = (const unsigned char *)name; size_t strip_len, previous_len; - /* If we're at the begining of a block, ignore the previous name */ + /* If we're at the beginning of a block, ignore the previous name */ strip_len = decode_varint(&cp); if (previous_ce) { previous_len = previous_ce->ce_namelen; diff --git a/refs/refs-internal.h b/refs/refs-internal.h index f2d8c0123a..ff2436c0fb 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -262,7 +262,7 @@ int refs_rename_ref_available(struct ref_store *refs, * after calling ref_iterator_advance() again or calling * ref_iterator_abort(), you must make a copy. When the iteration has * been exhausted, ref_iterator_advance() releases any resources - * assocated with the iteration, frees the ref_iterator object, and + * associated with the iteration, frees the ref_iterator object, and * returns ITER_DONE. If you want to abort the iteration early, call * ref_iterator_abort(), which also frees the ref_iterator object and * any associated resources. If there was an internal error advancing diff --git a/repository.c b/repository.c index 682c239fe3..a4174ddb06 100644 --- a/repository.c +++ b/repository.c @@ -200,9 +200,9 @@ int repo_submodule_init(struct repository *subrepo, if (repo_init(subrepo, gitdir.buf, worktree.buf)) { /* - * If initilization fails then it may be due to the submodule + * If initialization fails then it may be due to the submodule * not being populated in the superproject's worktree. Instead - * we can try to initilize the submodule by finding it's gitdir + * we can try to initialize the submodule by finding it's gitdir * in the superproject's 'modules' directory. In this case the * submodule would not have a worktree. */ diff --git a/repository.h b/repository.h index fe42197813..040057dea6 100644 --- a/repository.h +++ b/repository.h @@ -172,7 +172,7 @@ void repo_clear(struct repository *repo); * be allocated if needed. * * Return the number of index entries in the populated index or a value less - * than zero if an error occured. If the repository's index has already been + * than zero if an error occurred. If the repository's index has already been * populated then the number of entries will simply be returned. */ int repo_read_index(struct repository *repo); diff --git a/rerere.c b/rerere.c index 3e51fdfe58..9281131a9f 100644 --- a/rerere.c +++ b/rerere.c @@ -431,7 +431,7 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io, * and NUL concatenated together. * * Return 1 if conflict hunks are found, 0 if there are no conflict - * hunks and -1 if an error occured. + * hunks and -1 if an error occurred. */ static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size) { diff --git a/sequencer.c b/sequencer.c index 9d5964fd81..93e54a0497 100644 --- a/sequencer.c +++ b/sequencer.c @@ -131,7 +131,7 @@ static GIT_PATH_FUNC(rebase_path_rewritten_pending, "rebase-merge/rewritten-pending") /* - * The path of the file containig the OID of the "squash onto" commit, i.e. + * The path of the file containing the OID of the "squash onto" commit, i.e. * the dummy commit used for `reset [new root]`. */ static GIT_PATH_FUNC(rebase_path_squash_onto, "rebase-merge/squash-onto") @@ -4644,7 +4644,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, label_oid(oid, "branch-point", &state); } - /* Add HEAD as implict "tip of branch" */ + /* Add HEAD as implicit "tip of branch" */ if (!iter->next) tips_tail = &commit_list_insert(iter->item, tips_tail)->next; @@ -4826,7 +4826,7 @@ void todo_list_add_exec_commands(struct todo_list *todo_list, * are considered part of the pick, so we insert the commands *after* * those chains if there are any. * - * As we insert the exec commands immediatly after rearranging + * As we insert the exec commands immediately after rearranging * any fixups and before the user edits the list, a fixup chain * can never contain comments (any comments are empty picks that * have been commented out because the user did not specify diff --git a/server-info.c b/server-info.c index 4d8199b1d9..bae2cdfd51 100644 --- a/server-info.c +++ b/server-info.c @@ -93,7 +93,7 @@ static int update_info_file(char *path, uic.old_fp = fopen_or_warn(path, "r"); /* - * uic_printf will compare incremental comparison aginst old_fp + * uic_printf will compare incremental comparison against old_fp * and mark uic as stale if needed */ ret = generate(&uic); diff --git a/string-list.h b/string-list.h index f964399949..7bb0ad07e6 100644 --- a/string-list.h +++ b/string-list.h @@ -179,7 +179,7 @@ void string_list_remove(struct string_list *list, const char *string, /** * Check if the given string is part of a sorted list. If it is part of the list, - * return the coresponding string_list_item, NULL otherwise. + * return the corresponding string_list_item, NULL otherwise. */ struct string_list_item *string_list_lookup(struct string_list *list, const char *string); diff --git a/trace2/tr2_sid.c b/trace2/tr2_sid.c index 6948fd4108..dc6e75ef13 100644 --- a/trace2/tr2_sid.c +++ b/trace2/tr2_sid.c @@ -19,7 +19,7 @@ static int tr2sid_nr_git_parents; * "H" * "Localhost" when no hostname. * - * where is a 9 character string containing the least signifcant + * where is a 9 character string containing the least significant * 32 bits in the process-id. * "P" * (This is an abribrary choice. On most systems pid_t is a 32 bit value, diff --git a/unpack-trees.c b/unpack-trees.c index 8ba2dc3267..2f3cee596e 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -275,9 +275,9 @@ static int check_submodule_move_head(const struct cache_entry *ce, } /* - * Preform the loading of the repository's gitmodules file. This function is + * Perform the loading of the repository's gitmodules file. This function is * used by 'check_update()' to perform loading of the gitmodules file in two - * differnt situations: + * different situations: * (1) before removing entries from the working tree if the gitmodules file has * been marked for removal. This situation is specified by 'state' == NULL. * (2) before checking out entries to the working tree if the gitmodules file diff --git a/url.c b/url.c index e34e5e7517..e04bd60b6b 100644 --- a/url.c +++ b/url.c @@ -5,7 +5,7 @@ int is_urlschemechar(int first_flag, int ch) { /* * The set of valid URL schemes, as per STD66 (RFC3986) is - * '[A-Za-z][A-Za-z0-9+.-]*'. But use sightly looser check + * '[A-Za-z][A-Za-z0-9+.-]*'. But use slightly looser check * of '[A-Za-z0-9][A-Za-z0-9+.-]*' because earlier version * of check used '[A-Za-z0-9]+' so not to break any remote * helpers. diff --git a/xdiff-interface.h b/xdiff-interface.h index ede4246bbd..93df26900c 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -44,7 +44,7 @@ void discard_hunk_line(void *priv, * Compare the strings l1 with l2 which are of size s1 and s2 respectively. * Returns 1 if the strings are deemed equal, 0 otherwise. * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces - * are treated for the comparision. + * are treated for the comparison. */ int xdiff_compare_lines(const char *l1, long s1, const char *l2, long s2, long flags); From patchwork Tue Nov 5 17:07:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cai via GitGitGadget X-Patchwork-Id: 11228299 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5C8CD1864 for ; Tue, 5 Nov 2019 17:07:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30C8020656 for ; Tue, 5 Nov 2019 17:07:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Sjqo4lba" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390367AbfKERHm (ORCPT ); Tue, 5 Nov 2019 12:07:42 -0500 Received: from mail-wr1-f51.google.com ([209.85.221.51]:41936 "EHLO mail-wr1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388983AbfKERHl (ORCPT ); Tue, 5 Nov 2019 12:07:41 -0500 Received: by mail-wr1-f51.google.com with SMTP id p4so22291749wrm.8 for ; Tue, 05 Nov 2019 09:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=RNTLds/q9TLhbJaJE58Es0K92GjK4xXk4bCGiItcte4=; b=Sjqo4lbarA46tfvtcgE/5D+BqrfgubGTytJJRChiIyn41obd041NxAIT/YqNQb2ZVo fDrkwvCHfn/KYw4MYEPXj7p/MvGf0JO4t5WY3OFxka55srJqfvIaii101K1Q1ILfnnBr d+SZVJ2MAT5rz3jThQyIiVB/hvAHQ1DqhRz3ntwceSOlIBA70G2GxLv0Z8dUIoxZK+J1 IM3z8+l4rvIrdM1JYTSnfsRAj5fVMr4yGzbcFyY+ircIm0da9EiFk0s8B9YC4QaxZICu SBzYCLZ/LxcPcEtLN9FanVIpSdP06y5hx3Vc9Lz5Hib5nSnsodTJpUO8l21b/FdqcxFq YtkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=RNTLds/q9TLhbJaJE58Es0K92GjK4xXk4bCGiItcte4=; b=jKyLcdmx5F0wUZKxrjOiZIyCTh6qcr2HVIYXuvLjNZ3oBZkZDKYvYvoBJ+4507aa3s PbW6z6FjdRwq14VcQvoh0fxE7EcRmUvnWOUogQ39zEhNF5vxpcJj3FzgW8TNNLw2NPz1 mmfKB2pOWpC6I9TXsP0l7QbguUkQRvcP4d5U48aB6CHlzP+SYluNFPGm90fbiaIonblf D1JiAr1hajQLboERfCYL0U1CpRgAth8WtMb3vxbZtGRiUx6KpT+bLth7GBO9LViIzgIL fIvDqXft0qBAa5AORw8EDoD4UJIXnN6c5yFXXVbHilXKQeF/o2XA1q8+0DJaxCqrbpD4 pBmA== X-Gm-Message-State: APjAAAUYKUqgqGsBlxijU0bnx4OlbSfecDmGOjqFK7GNmLr/FmTUStih Aj2NA1wubFlYvW+9NN1kqAjK12VY X-Google-Smtp-Source: APXvYqxBAjRQw0WnyGdw5YYpTHgMh6q3EZlTUqVu7sk8NHmeV7DVMxuHTDE9hqdh9yx9KqA7FQV6xA== X-Received: by 2002:a05:6000:18e:: with SMTP id p14mr1670503wrx.98.1572973658860; Tue, 05 Nov 2019 09:07:38 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c15sm18787992wmb.45.2019.11.05.09.07.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 09:07:38 -0800 (PST) Message-Id: <6e6e5ad54931d33533d3367ba9124493c1e1ab7d.1572973652.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Tue, 05 Nov 2019 17:07:24 +0000 Subject: [PATCH v2 05/11] Fix spelling errors in comments of testcases Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Reported-by: Jens Schleusener Signed-off-by: Elijah Newren --- t/t0000-basic.sh | 2 +- t/t0027-auto-crlf.sh | 2 +- t/t0500-progress-display.sh | 4 ++-- t/t1512-rev-parse-disambiguation.sh | 2 +- t/t4100/t-apply-3.patch | 2 +- t/t4100/t-apply-7.patch | 2 +- t/t4213-log-tabexpand.sh | 2 +- t/t5528-push-default.sh | 2 +- t/t5702-protocol-v2.sh | 4 ++-- t/t6043-merge-rename-directories.sh | 6 +++--- t/t7519-status-fsmonitor.sh | 2 +- t/t9350-fast-export.sh | 2 +- t/t9809-git-p4-client-view.sh | 2 +- t/t9902-completion.sh | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 4d3f7ba295..7aabde1a69 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -126,7 +126,7 @@ check_sub_test_lib_test () { check_sub_test_lib_test_err () { name="$1" # stdin is the expected output from the test - # expected error output is in descriptior 3 + # expected error output is in descriptor 3 ( cd "$name" && sed -e 's/^> //' -e 's/Z$//' >expect.out && diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index 959b6da449..9fcd56fab3 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -215,7 +215,7 @@ stats_ascii () { } -# contruct the attr/ returned by git ls-files --eol +# construct the attr/ returned by git ls-files --eol # Take none (=empty), one or two args # convert.c: eol=XX overrides text=auto attr_ascii () { diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh index 24ccbd8d3b..d2d088d9a0 100755 --- a/t/t0500-progress-display.sh +++ b/t/t0500-progress-display.sh @@ -76,7 +76,7 @@ EOF ' test_expect_success 'progress display breaks long lines #2' ' - # Note: we dont need that many spaces after the title to cover up + # Note: we do not need that many spaces after the title to cover up # the last line before breaking the progress line. sed -e "s/Z$//" >expect <<\EOF && Working hard.......2.........3.........4.........5.........6: 0% (1/100000) @@ -104,7 +104,7 @@ EOF ' test_expect_success 'progress display breaks long lines #3 - even the first is too long' ' - # Note: we dont actually need any spaces at the end of the title + # Note: we do not actually need any spaces at the end of the title # line, because there is no previous progress line to cover up. sed -e "s/Z$//" >expect <<\EOF && Working hard.......2.........3.........4.........5.........6: Z diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index c19fb500cb..25744e270a 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -339,7 +339,7 @@ test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' ' test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' ' test_must_fail git rev-parse 000000000^{commit} 2>stderr && grep ^hint: stderr >hints && - # 5 commits, 1 tag (which is a commitish), plus intro line + # 5 commits, 1 tag (which is a committish), plus intro line test_line_count = 7 hints ' diff --git a/t/t4100/t-apply-3.patch b/t/t4100/t-apply-3.patch index 90cdbaa5bb..cac172e779 100644 --- a/t/t4100/t-apply-3.patch +++ b/t/t4100/t-apply-3.patch @@ -211,7 +211,7 @@ dissimilarity index 82% - - /* If this is an exact directory match, we may have - * directory files following this path. Match on them. -- * Otherwise, we're at a pach subcomponent, and we need +- * Otherwise, we're at a patch subcomponent, and we need - * to try to match again. - */ - if (mtype == 0) diff --git a/t/t4100/t-apply-7.patch b/t/t4100/t-apply-7.patch index 07c6589e74..fa24305108 100644 --- a/t/t4100/t-apply-7.patch +++ b/t/t4100/t-apply-7.patch @@ -335,7 +335,7 @@ diff a/ls-tree.c b/ls-tree.c - /* If this is an exact directory match, we may have - * directory files following this path. Match on them. -- * Otherwise, we're at a pach subcomponent, and we need +- * Otherwise, we're at a patch subcomponent, and we need - * to try to match again. + if (e->directory) { + /* If this is a directory, we have the following cases: diff --git a/t/t4213-log-tabexpand.sh b/t/t4213-log-tabexpand.sh index 7f90f58c03..53a4af3244 100755 --- a/t/t4213-log-tabexpand.sh +++ b/t/t4213-log-tabexpand.sh @@ -36,7 +36,7 @@ count_expand () esac # Prefix the output with the command line arguments, and - # replace SP with a dot both in the expecte and actual output + # replace SP with a dot both in the expected and actual output # so that test_cmp would show the difference together with the # breakage in a way easier to consume by the debugging user. { diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh index 44309566f1..4d1e0c363e 100755 --- a/t/t5528-push-default.sh +++ b/t/t5528-push-default.sh @@ -163,7 +163,7 @@ test_pushdefault_workflow success current master # update parent1's foo (which is our upstream) test_pushdefault_workflow success upstream foo -# upsream is foo which is not the name of the current branch +# upstream is foo which is not the name of the current branch test_pushdefault_workflow failure simple master # master and foo are updated diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh index ae9175cedf..96f58e40b6 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -682,9 +682,9 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' ' git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect && test_cmp expect actual && - # Client didnt request to use protocol v2 + # Client did not request to use protocol v2 ! grep "Git-Protocol: version=2" log && - # Server didnt respond using protocol v2 + # Server did not respond using protocol v2 ! grep "git< version 2" log ' diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index c966147d5d..df321cab78 100755 --- a/t/t6043-merge-rename-directories.sh +++ b/t/t6043-merge-rename-directories.sh @@ -744,7 +744,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu # # What if we were to attempt to do directory rename detection when someone # "mostly" moved a directory but still left some files around, or, -# equivalently, fully renamed a directory in one commmit and then recreated +# equivalently, fully renamed a directory in one commit and then recreated # that directory in a later commit adding some new files and then tried to # merge? # @@ -941,7 +941,7 @@ test_expect_success '5a-check: Merge directories, other side adds files to origi # Commit B: z/{b,c,d_1,e}, y/d_3 # Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3) # NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as -# we normaly would since z/ is being renamed to y/, then this would be +# we normally would since z/ is being renamed to y/, then this would be # a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add # conflict of y/d_1 vs. y/d_2 vs. y/d_3. Add/add/add is not # representable in the index, so the existence of y/d_3 needs to @@ -2089,7 +2089,7 @@ test_expect_success '8b-check: Dual-directory rename, one into the others way, w # # Note: It could easily be argued that the correct resolution here is # y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted) -# and that the modifed version of d should be present in y/ after +# and that the modified version of d should be present in y/ after # the merge, just marked as conflicted. Indeed, I previously did # argue that. But applying directory renames to the side of # history where a file is merely modified results in spurious diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index 997d5fb349..1e47ed2ca2 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -294,7 +294,7 @@ do done done -# test that splitting the index dosn't interfere +# test that splitting the index doesn't interfere test_expect_success 'splitting the index results in the same state' ' write_integration_script && dirty_repo && diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index 2e4e214815..db084fe625 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -541,7 +541,7 @@ test_expect_success 'tree_tag' ' # NEEDSWORK: not just check return status, but validate the output # Note that these tests DO NOTHING other than print a warning that -# they are ommitting the one tag we asked them to export (because the +# they are omitting the one tag we asked them to export (because the # tags resolve to a tree). They exist just to make sure we do not # abort but instead just warn. test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh index 3cff1fce1b..9c9710d8c7 100755 --- a/t/t9809-git-p4-client-view.sh +++ b/t/t9809-git-p4-client-view.sh @@ -407,7 +407,7 @@ test_expect_success 'reinit depot' ' ' # -# What happens when two files of the same name are overlayed together? +# What happens when two files of the same name are overlaid together? # The last-listed file should take preference. # # //depot diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 54f8ce18cb..e4af70aff1 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1257,7 +1257,7 @@ test_path_completion () # In the following tests calling this function we only # care about how __git_complete_index_file() deals with # unusual characters in path names. By requesting only - # untracked files we dont have to bother adding any + # untracked files we do not have to bother adding any # paths to the index in those tests. __git_complete_index_file --others && print_comp