From patchwork Sat Oct 2 18:44:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 12532337 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 712CAC433F5 for ; Sat, 2 Oct 2021 18:44:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4BDD861AE0 for ; Sat, 2 Oct 2021 18:44:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233872AbhJBSqD (ORCPT ); Sat, 2 Oct 2021 14:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233776AbhJBSqB (ORCPT ); Sat, 2 Oct 2021 14:46:01 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C184AC0613EC for ; Sat, 2 Oct 2021 11:44:14 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id g198-20020a1c20cf000000b0030d60cd7fd6so902589wmg.0 for ; Sat, 02 Oct 2021 11:44:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MAIrTdVNwGiyKZn2OBJ2YyxnXVySv+FpVhnXF0WTe+I=; b=LPWc9JNTTo0ZPJ48I1CGYjzpzwtX40HgFmBj9Ho4kOle38fhXqPh0iBnp3dH4Iu1Bt Je6s/i4ou07IAiyrusA1IAcDEdaPgRAQ1CX0OlEjufl3yc+eczqPDzOC/b3+bUIwZVog tHJU8tSA7koA7WM9qoad7yWcedII193+27H05Ilxce1PEqFlo7pZJBP24+g1KJ5eMtH8 ChwEm0S3VeVkpcNJM63N3Hg5whgx5ZxJTRY5wkz/fh3gR05qhuvI9bdp/yNnHaeUhymD D94EIBwe67CscB4pfcvscqAGUK4QX6sIc5TJGKxjqs1ca7iSmH5geOugdKe4qZguVlxG Pi0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MAIrTdVNwGiyKZn2OBJ2YyxnXVySv+FpVhnXF0WTe+I=; b=XxLwujtDq0aj1BYD7xZPcWHcJlA/gaNkhRkfkv6IpZRCSgUwOQwnRNP8HukmOqOx55 YvU7u9qnzQe4zV/gdpFvcLrDNz9QNYtNjkdXxsVIiUwIJAj+Hoijcwj1trCbEqJUmoW2 pUILAOd3BkoV+4JKL3NOPw2EByZ0/JBxAhXE/j2vMfwJZxdnaIP3WZQunHzDCldunH3m eTjy++Lj7OYjJpW/yGZWRcrCUZ46eg0L/kvsxz5sVTCkAemhIG3Q4f8/iMuSWbbm0hOw lbG8FUPIVfNxHSGG4llVzqmK8ygEPkRtzjZIAF5wzliO5tg3lJCciFR7H/yFlbdHUzs1 qrFQ== X-Gm-Message-State: AOAM531A9zvPCpY5PAOTGQxHKVcB+g50DeXGi8VWbni/x3hvw9ps7jjD kjNsSMVlCFIlgia5kJKImfKfLhE72qOOcQ== X-Google-Smtp-Source: ABdhPJwqGU8qTrzQ5WResAtm6WuDOZ8gNzSFyt5Mm/VFSBy6OTyMcIIxWbqkVc7jELyYA+OzGcDp4w== X-Received: by 2002:a7b:cc88:: with SMTP id p8mr10561826wma.101.1633200252556; Sat, 02 Oct 2021 11:44:12 -0700 (PDT) Received: from localhost.localdomain ([154.13.1.35]) by smtp.gmail.com with ESMTPSA id o1sm10379552wmq.26.2021.10.02.11.44.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 11:44:12 -0700 (PDT) From: Andrei Rybak To: git@vger.kernel.org Subject: [PATCH v1 1/3] *: spell Latin abbreviations correctly Date: Sat, 2 Oct 2021 20:44:05 +0200 Message-Id: <20211002184407.117282-2-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211002184407.117282-1-rybak.a.v@gmail.com> References: <20211002184407.117282-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Abbreviation "i.e." stands for Latin phrase "id est". Abbreviation "e.g." stands for Latin phrase "exempli gratia". Abbreviation "cf." stands for Latin "confer". Fix a couple of places where these were spelled incorrectly. All were found using: git grep -E ' ([Ee]g[.]|[Ii]e[.]|[Cc][.]f[.])' Signed-off-by: Andrei Rybak --- Originally the changes in this patch /3 were in three separate commits (one for "e.g", "i.e." and "cf." respectively), I'm not too sure about it, but leaning towards having it in a single commit. Documentation/config/commitgraph.txt | 2 +- Documentation/git-tag.txt | 2 +- compat/regex/regcomp.c | 2 +- contrib/coccinelle/README | 2 +- contrib/diff-highlight/t/t9400-diff-highlight.sh | 2 +- contrib/subtree/todo | 4 ++-- convert.c | 2 +- git-p4.py | 2 +- midx.c | 2 +- run-command.h | 2 +- t/t0021-conversion.sh | 4 ++-- transport.c | 6 +++--- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Documentation/config/commitgraph.txt b/Documentation/config/commitgraph.txt index 30604e4a4c..c37a1b7ddb 100644 --- a/Documentation/config/commitgraph.txt +++ b/Documentation/config/commitgraph.txt @@ -6,7 +6,7 @@ commitGraph.generationVersion:: commitGraph.maxNewFilters:: Specifies the default value for the `--max-new-filters` option of `git - commit-graph write` (c.f., linkgit:git-commit-graph[1]). + commit-graph write` (cf., linkgit:git-commit-graph[1]). commitGraph.readChangedPaths:: If true, then git will use the changed-path Bloom filters in the diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 31a97a1b6c..84491ff08e 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -297,7 +297,7 @@ On Automatic following ~~~~~~~~~~~~~~~~~~~~~~ If you are following somebody else's tree, you are most likely -using remote-tracking branches (eg. `refs/remotes/origin/master`). +using remote-tracking branches (e.g. `refs/remotes/origin/master`). You usually want the tags from the other end. On the other hand, if you are fetching because you would want a diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index d1bc09e49b..fcf7b2daf6 100644 --- a/compat/regex/regcomp.c +++ b/compat/regex/regcomp.c @@ -2370,7 +2370,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, } /* We must return here, since ANCHORs can't be followed by repetition operators. - eg. RE"^*" is invalid or "", + e.g. RE"^*" is invalid or "", it must not be "". */ fetch_token (token, regexp, syntax); return tree; diff --git a/contrib/coccinelle/README b/contrib/coccinelle/README index f0e80bd7f0..c7723a5542 100644 --- a/contrib/coccinelle/README +++ b/contrib/coccinelle/README @@ -18,7 +18,7 @@ There are two types of semantic patches: a strbuf, 2018-03-25) f919ffebed (Use MOVE_ARRAY, 2018-01-22) - These types of semantic patches are usually part of testing, c.f. + These types of semantic patches are usually part of testing, cf. 0860a7641b (travis-ci: fail if Coccinelle static analysis found something to transform, 2018-07-23) diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh index f6f5195d00..12140b9734 100755 --- a/contrib/diff-highlight/t/t9400-diff-highlight.sh +++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh @@ -21,7 +21,7 @@ fi # dh_test is a test helper function which takes 3 file names as parameters. The # first 2 files are used to generate diff and commit output, which is then # piped through diff-highlight. The 3rd file should contain the expected output -# of diff-highlight (minus the diff/commit header, ie. everything after and +# of diff-highlight (minus the diff/commit header, i.e. everything after and # including the first @@ line). dh_test () { a="$1" b="$2" && diff --git a/contrib/subtree/todo b/contrib/subtree/todo index 32d2ce3a40..c9cef579b7 100644 --- a/contrib/subtree/todo +++ b/contrib/subtree/todo @@ -1,7 +1,7 @@ delete tempdir - 'git subtree rejoin' option to do the same as --rejoin, eg. after a + 'git subtree rejoin' option to do the same as --rejoin, e.g. after a rebase --prefix doesn't force the subtree correctly in merge/pull: @@ -39,7 +39,7 @@ make a 'force-update' that does what 'add' does even if the subtree already exists. That way we can help people who imported - subtrees "incorrectly" (eg. by just copying in the files) in + subtrees "incorrectly" (e.g. by just copying in the files) in the past. guess --prefix automatically if possible based on pwd diff --git a/convert.c b/convert.c index 0d6fb3410a..83ad1c4183 100644 --- a/convert.c +++ b/convert.c @@ -335,7 +335,7 @@ static int check_roundtrip(const char *enc_name) { /* * check_roundtrip_encoding contains a string of comma and/or - * space separated encodings (eg. "UTF-16, ASCII, CP1125"). + * space separated encodings (e.g. "UTF-16, ASCII, CP1125"). * Search for the given encoding in that string. */ const char *found = strcasestr(check_roundtrip_encoding, enc_name); diff --git a/git-p4.py b/git-p4.py index 2b4500226a..eae4e5ff8f 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1388,7 +1388,7 @@ def generatePointer(self, contentFile): # Git LFS removed the preamble in the output of the 'pointer' command # starting from version 1.2.0. Check for the preamble here to support # earlier versions. - # c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43 + # cf. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43 if pointerFile.startswith('Git LFS pointer for'): pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile) diff --git a/midx.c b/midx.c index f96fb2efee..11a9a4219b 100644 --- a/midx.c +++ b/midx.c @@ -1002,7 +1002,7 @@ static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash, /* * Build the MIDX-order index based on pdata.objects (which is already - * in MIDX order; c.f., 'midx_pack_order_cmp()' for the definition of + * in MIDX order; cf., 'midx_pack_order_cmp()' for the definition of * this order). */ ALLOC_ARRAY(index, pdata.nr_objects); diff --git a/run-command.h b/run-command.h index b9aff74914..5d4c9dc7f4 100644 --- a/run-command.h +++ b/run-command.h @@ -170,7 +170,7 @@ struct child_process { * non-zero. * * - If the program terminated due to a signal, then the return value is the - * signal number + 128, ie. the same value that a POSIX shell's $? would + * signal number + 128, i.e. the same value that a POSIX shell's $? would * report. A diagnostic is printed. * */ diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 33dfc9cd56..d9f1a04133 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -35,7 +35,7 @@ filter_git () { # Compare two files and ensure that `clean` and `smudge` respectively are # called at least once if specified in the `expect` file. The actual # invocation count is not relevant because their number can vary. -# c.f. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ +# cf. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ test_cmp_count () { expect=$1 actual=$2 @@ -50,7 +50,7 @@ test_cmp_count () { # Compare two files but exclude all `clean` invocations because Git can # call `clean` zero or more times. -# c.f. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ +# cf. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ test_cmp_exclude_clean () { expect=$1 actual=$2 diff --git a/transport.c b/transport.c index b37664ba87..999bf0f2ca 100644 --- a/transport.c +++ b/transport.c @@ -1167,9 +1167,9 @@ void transport_set_verbosity(struct transport *transport, int verbosity, * Rules used to determine whether to report progress (processing aborts * when a rule is satisfied): * - * . Report progress, if force_progress is 1 (ie. --progress). - * . Don't report progress, if force_progress is 0 (ie. --no-progress). - * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). + * . Report progress, if force_progress is 1 (i.e. --progress). + * . Don't report progress, if force_progress is 0 (i.e. --no-progress). + * . Don't report progress, if verbosity < 0 (i.e. -q/--quiet ). * . Report progress if isatty(2) is 1. **/ if (force_progress >= 0) From patchwork Sat Oct 2 18:44:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 12532341 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD811C433EF for ; Sat, 2 Oct 2021 18:44:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC97861B2F for ; Sat, 2 Oct 2021 18:44:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233875AbhJBSqE (ORCPT ); Sat, 2 Oct 2021 14:46:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233870AbhJBSqD (ORCPT ); Sat, 2 Oct 2021 14:46:03 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E00FCC0613EC for ; Sat, 2 Oct 2021 11:44:15 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id l18-20020a05600c4f1200b002f8cf606262so14193361wmq.1 for ; Sat, 02 Oct 2021 11:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=I418HH5UaNsMpfqCUjO10f7Rvm63o5QtIrXEFp8Iqjw=; b=RviWlQs5+vuHnm3sDnxGBLBSlj5dDTVg1WejhrFkRHQxaV7zGNDE+3mihxPlPHR+6H ZJJz8+M+aTTtvjQ42ShWjJpDACx/5k7vKPB23fWSbS7ah7+qiifVSjHGP4Vw9paSzBga Qz/mbQMTvkkhAsc9Ehdk/f7njmBJSdviOcNaWWpmeIb/gzQIYs/qqmhTzBBlLIz05+RE 5PSRzMLcrATMcq0VPEBpbdtIQNLyWXlAdaeCpvUTOSsq+s3NBi+sYdUsePmKhdRgfJYc nVNnmb+EVcGl35GacMXYxtJl/k0o95swN83QV1+tkPcuGYe8X7+OLD0Gdp26QSgpMJqA qEqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I418HH5UaNsMpfqCUjO10f7Rvm63o5QtIrXEFp8Iqjw=; b=zM1jVNhydR3TR1uAxU6EeZlTqJji4HP7oIqutOAohagjyDdMuVBAFhWW9GFauhHUIq qxj3HpzmSbYAGl4EhMw6V9RgU43qJG5En1DcbqWa8Fw67wuAOAxEXHdE10529osvQ00d HL/YUqtsLl4+xw6M+jb52ulWopfgqBLQXYB7zp5we+MsFJeIttFvQrGyHkdZ8UMnZbD9 MxRqGhG2/yzJIK2Rm0i2LD0Vl/fYa2xrngpJTExdYNZoWpUzGUTV0P5d6Uk6ZeT86sYU 6hYFGtig6ji2/ig7L7f+7rNUBHzGhc4varm/VH4Qw4OZaFqWOhiaWvYgzj9+g1+9DdkU 00Ew== X-Gm-Message-State: AOAM5311BBlfn24QVuuamll9RgVJmXAnJ0I5Czn8T50X3Uj6U34dHWRb Slp6eWarGbFJjy2rgs/VV3Hnq/yPeOwqSA== X-Google-Smtp-Source: ABdhPJyNbJEQMVie1G6IoF5tGxWdMOpwZITHO0uVH3j/Fpk+Lnzfm661eHLMywzauNFkuPi4Q5NR8g== X-Received: by 2002:a7b:c5c7:: with SMTP id n7mr10582742wmk.5.1633200253544; Sat, 02 Oct 2021 11:44:13 -0700 (PDT) Received: from localhost.localdomain ([154.13.1.35]) by smtp.gmail.com with ESMTPSA id o1sm10379552wmq.26.2021.10.02.11.44.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 11:44:12 -0700 (PDT) From: Andrei Rybak To: git@vger.kernel.org Subject: [PATCH v1 2/3] *: fix spelling typos Date: Sat, 2 Oct 2021 20:44:06 +0200 Message-Id: <20211002184407.117282-3-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211002184407.117282-1-rybak.a.v@gmail.com> References: <20211002184407.117282-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Most of these were found using the 'codespell' tool. https://github.com/codespell-project/codespell Signed-off-by: Andrei Rybak Reviewed-by: Elijah Newren --- Documentation/config.txt | 2 +- Documentation/config/mergetool.txt | 2 +- Documentation/git-describe.txt | 2 +- Documentation/git-format-patch.txt | 2 +- Documentation/git-mktag.txt | 2 +- Documentation/git.txt | 2 +- .../technical/commit-graph-format.txt | 2 +- Documentation/technical/commit-graph.txt | 4 ++-- .../technical/remembering-renames.txt | 2 +- bloom.h | 2 +- builtin/help.c | 2 +- builtin/name-rev.c | 2 +- cbtree.c | 2 +- commit-graph.h | 2 +- compat/precompose_utf8.c | 2 +- compat/simple-ipc/ipc-unix-socket.c | 2 +- diffcore-rename.c | 2 +- git-instaweb.sh | 2 +- git-p4.py | 8 ++++---- merge-ort.c | 6 +++--- perl/Git/I18N.pm | 2 +- rebase.c | 2 +- sideband.c | 2 +- t/t0000-basic.sh | 4 ++-- t/t0021/rot13-filter.pl | 2 +- t/t1407-worktree-ref-store.sh | 2 +- t/t2082-parallel-checkout-attributes.sh | 2 +- t/t3431-rebase-fork-point.sh | 2 +- t/t5411/test-0034-report-ft.sh | 2 +- t/t5411/test-0035-report-ft--porcelain.sh | 2 +- t/t5531-deep-submodule-push.sh | 2 +- t/t6404-recursive-merge.sh | 2 +- t/t7064-wtstatus-pv2.sh | 2 +- t/t7601-merge-pull-config.sh | 2 +- t/t8009-blame-vs-topicbranches.sh | 2 +- t/t9150/svk-merge.dump | 10 +++++----- t/t9151/svn-mergeinfo.dump | 18 +++++++++--------- trace2/tr2_tls.h | 2 +- 38 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 0c0e6b859f..1167e88e34 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -304,7 +304,7 @@ path relative to Git's "runtime prefix", i.e. relative to the location where Git itself was installed. For example, `%(prefix)/bin/` refers to the directory in which the Git executable itself lives. If Git was compiled without runtime prefix support, the compiled-in prefix will be -subsituted instead. In the unlikely event that a literal path needs to +substituted instead. In the unlikely event that a literal path needs to be specified that should _not_ be expanded, it needs to be prefixed by `./`, like so: `./%(prefix)/bin`. diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt index cafbbef46a..f691afa93d 100644 --- a/Documentation/config/mergetool.txt +++ b/Documentation/config/mergetool.txt @@ -50,7 +50,7 @@ mergetool.hideResolved:: possible and write the 'MERGED' file containing conflict markers around any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally represent the versions of the file from before Git's conflict - resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so + resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwritten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the `mergetool..hideResolved` configuration variable. Defaults to `false`. diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index c6a79c2a0f..8ace8fb78a 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -140,7 +140,7 @@ at the end. The number of additional commits is the number of commits which would be displayed by "git log v1.0.4..parent". -The hash suffix is "-g" + an unambigous abbreviation for the tip commit +The hash suffix is "-g" + an unambiguous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index fe2f69d36e..f2c17164ed 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -242,7 +242,7 @@ populated with placeholder text. or "--reroll-count=4rev2" are allowed), but the downside of using such a reroll-count is that the range-diff/interdiff with the previous version does not state exactly which - version the new interation is compared against. + version the new iteration is compared against. --to=:: Add a `To:` header to the email headers. This is in addition diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt index 466a697519..b2a2e80d42 100644 --- a/Documentation/git-mktag.txt +++ b/Documentation/git-mktag.txt @@ -33,7 +33,7 @@ from warnings to errors (so e.g. a missing "tagger" line is an error). Extra headers in the object are also an error under mktag, but ignored by linkgit:git-fsck[1]. This extra check can be turned off by setting -the appropriate `fsck.` varible: +the appropriate `fsck.` variable: git -c fsck.extraHeaderEntry=ignore mktag TIME_MIN + CUTOFF_DATE_SLOP) cutoff = cutoff - CUTOFF_DATE_SLOP; else diff --git a/cbtree.c b/cbtree.c index b0c65d810f..fb68511247 100644 --- a/cbtree.c +++ b/cbtree.c @@ -11,7 +11,7 @@ static struct cb_node *cb_node_of(const void *p) return (struct cb_node *)((uintptr_t)p - 1); } -/* locate the best match, does not do a final comparision */ +/* locate the best match, does not do a final comparison */ static struct cb_node *cb_internal_best_match(struct cb_node *p, const uint8_t *k, size_t klen) { diff --git a/commit-graph.h b/commit-graph.h index 04a94e1830..bf37480504 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -13,7 +13,7 @@ * This method is only used to enhance coverage of the commit-graph * feature in the test suite with the GIT_TEST_COMMIT_GRAPH and * GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS environment variables. Do not - * call this method oustide of a builtin, and only if you know what + * call this method outside of a builtin, and only if you know what * you are doing! */ void git_test_write_commit_graph_or_die(void); diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c index cce1d57a46..e330904497 100644 --- a/compat/precompose_utf8.c +++ b/compat/precompose_utf8.c @@ -80,7 +80,7 @@ const char *precompose_string_if_needed(const char *in) out = reencode_string_iconv(in, inlen, ic_prec, 0, &outlen); if (out) { if (outlen == inlen && !memcmp(in, out, outlen)) - free(out); /* no need to return indentical */ + free(out); /* no need to return identical */ else in = out; } diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c index 1927e6ef4b..9685523f12 100644 --- a/compat/simple-ipc/ipc-unix-socket.c +++ b/compat/simple-ipc/ipc-unix-socket.c @@ -685,7 +685,7 @@ static int accept_thread__wait_for_connection( * Block SIGPIPE in this thread for the life of the thread. This * avoids any stray SIGPIPE signals when closing pipe fds under * extremely heavy loads (such as when the fifo queue is full and we - * drop incomming connections). + * drop incoming connections). */ static void *accept_thread_proc(void *_accept_thread_data) { diff --git a/diffcore-rename.c b/diffcore-rename.c index bebd4ed6a4..2d962ce2ad 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -926,7 +926,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. */ diff --git a/git-instaweb.sh b/git-instaweb.sh index 7c55229773..d04536bda8 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -615,7 +615,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" <offsets is * updated to diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm index 895e759c57..228e4d6659 100644 --- a/perl/Git/I18N.pm +++ b/perl/Git/I18N.pm @@ -111,7 +111,7 @@ =head2 __n($$$) =head2 N__($) No-operation that only returns its argument. Use this if you want xgettext to -extract the text to the pot template but do not want to trigger retrival of the +extract the text to the pot template but do not want to trigger retrieval of the translation at run time. =head1 AUTHOR diff --git a/rebase.c b/rebase.c index f8137d859b..97fcc7d615 100644 --- a/rebase.c +++ b/rebase.c @@ -9,7 +9,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) diff --git a/sideband.c b/sideband.c index 85bddfdcd4..faea1dd100 100644 --- a/sideband.c +++ b/sideband.c @@ -184,7 +184,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 diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 5c342de713..2384a8e533 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -811,7 +811,7 @@ test_expect_success 'tests respect lazy prerequisites' ' run_sub_test_lib_test lazy-prereqs "respect lazy prereqs" <<-\EOF && test_lazy_prereq LAZY_TRUE true - test_expect_success LAZY_TRUE "lazy prereq is satisifed" "true" + test_expect_success LAZY_TRUE "lazy prereq is satisfied" "true" test_expect_success !LAZY_TRUE "negative lazy prereq" "false" test_lazy_prereq LAZY_FALSE false @@ -822,7 +822,7 @@ test_expect_success 'tests respect lazy prerequisites' ' EOF check_sub_test_lib_test lazy-prereqs <<-\EOF - ok 1 - lazy prereq is satisifed + ok 1 - lazy prereq is satisfied ok 2 # skip negative lazy prereq (missing !LAZY_TRUE) ok 3 # skip lazy prereq not satisfied (missing LAZY_FALSE) ok 4 - negative false prereq diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl index 7bb93768f3..98aa47c575 100644 --- a/t/t0021/rot13-filter.pl +++ b/t/t0021/rot13-filter.pl @@ -9,7 +9,7 @@ # ("clean", "smudge", etc). # # When --always-delay is given all pathnames with the "can-delay" flag -# that don't appear on the list bellow are delayed with a count of 1 +# that don't appear on the list below are delayed with a count of 1 # (see more below). # # This implementation supports special test cases: diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh index ad8006c813..1364f9c8f6 100755 --- a/t/t1407-worktree-ref-store.sh +++ b/t/t1407-worktree-ref-store.sh @@ -55,7 +55,7 @@ test_expect_success 'create_symref(FOO, refs/heads/main)' ' # Some refs (refs/bisect/*, pseudorefs) are kept per worktree, so they should # only appear in the for-each-reflog output if it is called from the correct # worktree, which is exercised in this test. This test is poorly written (and -# therefore marked REFFILES) for mulitple reasons: 1) it creates invalidly +# therefore marked REFFILES) for multiple reasons: 1) it creates invalidly # formatted log entres. 2) it uses direct FS access for creating the reflogs. 3) # PSEUDO-WT and refs/bisect/random do not create reflogs by default, so it is # not testing a realistic scenario. diff --git a/t/t2082-parallel-checkout-attributes.sh b/t/t2082-parallel-checkout-attributes.sh index 2525457961..363a693ca0 100755 --- a/t/t2082-parallel-checkout-attributes.sh +++ b/t/t2082-parallel-checkout-attributes.sh @@ -90,7 +90,7 @@ test_expect_success 'parallel-checkout with eol conversions' ' # Entries that require an external filter are not eligible for parallel # checkout. Check that both the parallel-eligible and non-eligible entries are -# properly writen in a single checkout operation. +# properly written in a single checkout operation. # test_expect_success 'parallel-checkout and external filter' ' set_checkout_config 2 0 && diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh index 4c98d99e7e..97dadf40a9 100755 --- a/t/t3431-rebase-fork-point.sh +++ b/t/t3431-rebase-fork-point.sh @@ -73,7 +73,7 @@ test_rebase 'G F C D B A' --onto D main test_rebase 'G F C B A' --keep-base refs/heads/main test_rebase 'G F C B A' --keep-base main -test_expect_success 'git rebase --fork-point with ambigous refname' ' +test_expect_success 'git rebase --fork-point with ambiguous refname' ' git checkout main && git checkout -b one && git checkout side && diff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh index 73a47d1ffd..415d4e3316 100644 --- a/t/t5411/test-0034-report-ft.sh +++ b/t/t5411/test-0034-report-ft.sh @@ -10,7 +10,7 @@ test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" ' # Refs of upstream : main(A) # Refs of workbench: main(A) tags/v123 # git push : refs/for/main/topic(B) -test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)" ' +test_expect_success "proc-receive: fall through, let receive-pack to execute ($PROTOCOL)" ' git -C workbench push origin \ $B:refs/for/main/topic \ >out 2>&1 && diff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh index c350201107..5d17aa3eb7 100644 --- a/t/t5411/test-0035-report-ft--porcelain.sh +++ b/t/t5411/test-0035-report-ft--porcelain.sh @@ -10,7 +10,7 @@ test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain) # Refs of upstream : main(A) # Refs of workbench: main(A) tags/v123 # git push : refs/for/main/topic(B) -test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)" ' +test_expect_success "proc-receive: fall through, let receive-pack to execute ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ $B:refs/for/main/topic \ >out 2>&1 && diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index d573ca496a..2a1d092906 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -200,7 +200,7 @@ test_expect_success 'push recurse-submodules last one wins on command line' ' cd work/gar/bage && >recurse-check-on-command-line-overriding-earlier-command-line && git add recurse-check-on-command-line-overriding-earlier-command-line && - git commit -m "Recurse on command-line overridiing earlier command-line junk" + git commit -m "Recurse on command-line overriding earlier command-line junk" ) && ( cd work && diff --git a/t/t6404-recursive-merge.sh b/t/t6404-recursive-merge.sh index eaf48e941e..7f7b5c1f72 100755 --- a/t/t6404-recursive-merge.sh +++ b/t/t6404-recursive-merge.sh @@ -87,7 +87,7 @@ test_expect_success 'result contains a conflict' ' ' test_expect_success 'virtual trees were processed' ' - # TODO: fragile test, relies on ambigious merge-base resolution + # TODO: fragile test, relies on ambiguous merge-base resolution git ls-files --stage >out && cat >expect <<-EOF && diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh index eeb0534163..4c1f7b512a 100755 --- a/t/t7064-wtstatus-pv2.sh +++ b/t/t7064-wtstatus-pv2.sh @@ -80,7 +80,7 @@ test_expect_success 'before initial commit, things added (-z)' ' test_cmp expect actual ' -test_expect_success 'make first commit, comfirm HEAD oid and branch' ' +test_expect_success 'make first commit, confirm HEAD oid and branch' ' git commit -m initial && H0=$(git rev-parse HEAD) && cat >expect <<-EOF && diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 1f652f433e..22b88164ef 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -280,7 +280,7 @@ test_expect_success '--rebase overrides pull.ff unset' ' test_does_rebase pull --rebase ' -# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff +# Group 4: --no-rebase heeds pull.ff=!only or explicit --ff or --no-ff test_expect_success '--no-rebase works with --no-ff' ' test_does_merge_when_ff_possible pull --no-rebase --no-ff diff --git a/t/t8009-blame-vs-topicbranches.sh b/t/t8009-blame-vs-topicbranches.sh index 72596e38b2..c37c33a980 100755 --- a/t/t8009-blame-vs-topicbranches.sh +++ b/t/t8009-blame-vs-topicbranches.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='blaming trough history with topic branches' +test_description='blaming through history with topic branches' . ./test-lib.sh # Creates the history shown below. '*'s mark the first parent in the merges. diff --git a/t/t9150/svk-merge.dump b/t/t9150/svk-merge.dump index 42f70dbec7..6a8ac81b11 100644 --- a/t/t9150/svk-merge.dump +++ b/t/t9150/svk-merge.dump @@ -77,7 +77,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -206,7 +206,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -310,7 +310,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -417,7 +417,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -534,7 +534,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will diff --git a/t/t9151/svn-mergeinfo.dump b/t/t9151/svn-mergeinfo.dump index 47cafcf528..d5e1695637 100644 --- a/t/t9151/svn-mergeinfo.dump +++ b/t/t9151/svn-mergeinfo.dump @@ -87,7 +87,7 @@ Content-length: 2411 PROPS-END # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -260,7 +260,7 @@ Content-length: 2465 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -365,7 +365,7 @@ Content-length: 2521 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -473,7 +473,7 @@ Content-length: 2529 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -578,7 +578,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -767,7 +767,7 @@ Content-length: 2593 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -948,7 +948,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -1172,7 +1172,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will @@ -1414,7 +1414,7 @@ Content-length: 2713 # -DCOLLISION_CHECK if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you -# enough guarantees about no collisions between objects ever hapenning. +# enough guarantees about no collisions between objects ever happening. # # -DNSEC if you want git to care about sub-second file mtimes and ctimes. # Note that you need some new glibc (at least >2.2.4) for this, and it will diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h index b1e327a928..6908045a32 100644 --- a/trace2/tr2_tls.h +++ b/trace2/tr2_tls.h @@ -4,7 +4,7 @@ #include "strbuf.h" /* - * Arbitry limit for thread names for column alignment. + * Arbitrary limit for thread names for column alignment. */ #define TR2_MAX_THREAD_NAME (24) From patchwork Sat Oct 2 18:44:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 12532339 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E16AC433F5 for ; Sat, 2 Oct 2021 18:44:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E41F161B39 for ; Sat, 2 Oct 2021 18:44:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233883AbhJBSqF (ORCPT ); Sat, 2 Oct 2021 14:46:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233871AbhJBSqD (ORCPT ); Sat, 2 Oct 2021 14:46:03 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19BA1C0613EF for ; Sat, 2 Oct 2021 11:44:16 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id e12so1030991wra.4 for ; Sat, 02 Oct 2021 11:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=r2BOhgMuigtDKIORNMRbVFH4WkrffwDReHnw2Xi622s=; b=G+AMXgJSURluLAMDE1jlynrDcITafJ9tBQweU0FJt5o4vhn3FBIrXVAE9nCGiWGoGr zOFT0ZHoeZ92/Sv0fbnbXJjAsiSFAwMj4tuFa4wwK5kcfvSudZn8kKVagfB6gExwESff /FYZCzldnpIUqDWMeVV7z6fhoiaJ4YcMhML/BTPiT9B82nPNAAkyqwWmEGo56qxAOdFL gxj2l0TiLJ+aRSIY/Lk0NM/UG6bJBVUfi2QZBp526dBC5i36g7bnWap+xsoOhPdr/s9Q QwdSxE6taNU46GSw9gYtaeBNMLkWf95IO1V5DC2zewvP3Utl0T1dUbme9/RhzDSXrV0e irDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r2BOhgMuigtDKIORNMRbVFH4WkrffwDReHnw2Xi622s=; b=Qw8lQUz0Xx063h9CCPWM9OP1yUX7gJJ7JUrtXHQHVq7g1xxWLYdSUZCEINj0a9WZXn s/g7uJGZg4fhIJFmZBKjSKOwI5T57rR9ZE14sIJoELMgq1KmNF0orU/+1jorYiI7AwLp yP+AdlKvdsN4Q6xynmJQUdUr+WqM11WTactBxpzzYgbW74O+/Lwt7ypzZ9yTL38dopZd 5rdpGirBTApEdAoYCTC7ZjT/NEYHt9t27tXkmPQPeclqWcaN02+KoZKSpblpN7A+rEKG lsLhxdYeIGn49nM3smR+5q6G1ghI0RAc3FrBY+/XuSKje4nc7uDP6pIoTuB0aRHUl6vE QmoA== X-Gm-Message-State: AOAM530XKMc17hW6BTlgIETHkI1a7KcknAyvy5Sq/7BYPMOggw7vvDN9 2hED/VhpM2alMOwO11ivyoZZrawLcJ3feA== X-Google-Smtp-Source: ABdhPJwAJkdtDgapkmkEEIPjBwQnftl7z5OEBSJPEzgwy24okc1HhBks1lMSjnHJHhassCRbyIr0XA== X-Received: by 2002:adf:9147:: with SMTP id j65mr4645489wrj.163.1633200254298; Sat, 02 Oct 2021 11:44:14 -0700 (PDT) Received: from localhost.localdomain ([154.13.1.35]) by smtp.gmail.com with ESMTPSA id o1sm10379552wmq.26.2021.10.02.11.44.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 11:44:13 -0700 (PDT) From: Andrei Rybak To: git@vger.kernel.org Subject: [PATCH v1 3/3] difftool: add space after full stop in comments Date: Sat, 2 Oct 2021 20:44:07 +0200 Message-Id: <20211002184407.117282-4-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211002184407.117282-1-rybak.a.v@gmail.com> References: <20211002184407.117282-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org These punctuation typos were found using: git grep -P ' [a-z0-9A-Z-]+[.][A-Z][A-Za-z-]+ ' Signed-off-by: Andrei Rybak --- I've also looked for similar typos around commas and semicolons and didn't find any. builtin/difftool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/difftool.c b/builtin/difftool.c index bb9fe7245a..d9a4e55caf 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -529,7 +529,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, goto finish; /* - * Changes to submodules require special treatment.This loop writes a + * Changes to submodules require special treatment. This loop writes a * temporary file to both the left and right directories to show the * change in the recorded SHA1 for the submodule. */ @@ -548,7 +548,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, } /* - * Symbolic links require special treatment.The standard "git diff" + * Symbolic links require special treatment. The standard "git diff" * shows only the link itself, not the contents of the link target. * This loop replicates that behavior. */