From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 334D41F5AE for ; Wed, 9 Jun 2021 10:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236658AbhFIK2l (ORCPT ); Wed, 9 Jun 2021 06:28:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234037AbhFIK2k (ORCPT ); Wed, 9 Jun 2021 06:28:40 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 738B5C061574 for ; Wed, 9 Jun 2021 03:26:46 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id ho18so26679387ejc.8 for ; Wed, 09 Jun 2021 03:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pqMpA+gw2mc9nUdTL1iAvIjWhZLHblbgXlhGBFQa7V4=; b=h1pRPw7G3rBvRtFJU7CQh7CvI+xsSKZmaW779+oVNrcZZXCLvR95iK6methv7ewK7l qBld8k1GDE8dVfFqrvkclkUXOCIkvCYTEf91QzhnhdddcL39sORnzyNIBMydYoq6SgDu kE3EeBsEkJz8MrYJ/6NiSzJXYd1Kl4B6yFP0POkcDM9VRAviSBDrQEzNPudVPSrSaJCY UEW1OSH9/T50pGAXhkk0BIvT93KOCN5TfufuNDB4ZHyCbw8cWzB9S3CKFJYA5BTMYCIE a9TRHZIQOEEJovlhsKCHcreTYT+XjJ168wOnI80KD1xk3HTU6fCE0UPCQYN/4QO09Klf 4nRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pqMpA+gw2mc9nUdTL1iAvIjWhZLHblbgXlhGBFQa7V4=; b=c1kOwVEqzUGOG394N2l7tHsqriXs86Qj+v68Atz9tddWfp4BZasxAFHs2qAvR/dywg VhavgxJy0MznZl3r/YkH37QvzOl9GVo4v1UdnpiVLIb7f/jUlzHHosfkPaVYat0pnedM K/AXS/OgJUrdJMtiBljGxOMStmGeGdPYK5X4GPXJacAYqoin/rnLNEM1Nx4T9siZxQvm 0463NTXHC1akQ0W6Jn+iXxvzEl4r1JUClSoYQ0PfULhKOHbU5WZDS/ajE4XU5jdkcITj xk7sVJb5LFmup17kPxwT72oVIOx/nr1M09QAxNu+0ZcgObkdRxNhrJ0mlbhCGk4RozwF ALmA== X-Gm-Message-State: AOAM5327gvbGU4pjELlrKRjbdr/lddoKzoGaMjHSVklgVJS7YBp7wNUt qjSvUHzeft75rEQT2Pqpn9a+ejhbZQI= X-Google-Smtp-Source: ABdhPJwbUXkuE8ggkxeB1TWHqg/Acbaw0mauTi3Qu+7659gNS2U6wDi8eOIfX1KjVPXC1TEWcmy8uA== X-Received: by 2002:a17:906:3a05:: with SMTP id z5mr27303372eje.505.1623234404629; Wed, 09 Jun 2021 03:26:44 -0700 (PDT) Received: from localhost.localdomain ([212.102.57.83]) by smtp.gmail.com with ESMTPSA id gz5sm907665ejb.113.2021.06.09.03.26.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 03:26:44 -0700 (PDT) From: Andrei Rybak To: git@vger.kernel.org Subject: [PATCH] fix typos which duplicate a word Date: Wed, 9 Jun 2021 12:26:41 +0200 Message-Id: <20210609102641.3531183-1-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Fix typos in documentation and code comments which repeat various words. These typos were found by searching using scripts like this: for w in $(grep '^....$' /usr/share/dict/words) do git grep -P "\b$w $w\b" done Signed-off-by: Andrei Rybak --- I'm not sure what to put as the "area: " prefix for this patch, as it touches both docs and code comments. Documentation/technical/protocol-v2.txt | 2 +- attr.c | 2 +- builtin/log.c | 3 +-- git-compat-util.h | 2 +- git-cvsserver.perl | 2 +- remote.c | 2 +- t/t5505-remote.sh | 2 +- t/t6416-recursive-corner-cases.sh | 2 +- t/t9100-git-svn-basic.sh | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt index a1e31367f4..1040d85319 100644 --- a/Documentation/technical/protocol-v2.txt +++ b/Documentation/technical/protocol-v2.txt @@ -540,7 +540,7 @@ An `object-info` request takes the following arguments: Indicates to the server an object which the client wants to obtain information for. -The response of `object-info` is a list of the the requested object ids +The response of `object-info` is a list of the requested object ids and associated requested information, each separated by a single space. output = info flush-pkt diff --git a/attr.c b/attr.c index 9e897e43f5..d029e681f2 100644 --- a/attr.c +++ b/attr.c @@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list) * Callers into the attribute system assume there is a single, system-wide * global state where attributes are read from and when the state is flipped by * calling git_attr_set_direction(), the stack frames that have been - * constructed need to be discarded so so that subsequent calls into the + * constructed need to be discarded so that subsequent calls into the * attribute system will lazily read from the right place. Since changing * direction causes a global paradigm shift, it should not ever be called while * another thread could potentially be calling into the attribute system. diff --git a/builtin/log.c b/builtin/log.c index 6102893fcc..516a1142dd 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1968,8 +1968,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) } else if (rev.diffopt.close_file) { /* * The diff code parsed --output; it has already opened the - * file, but but we must instruct it not to close after each - * diff. + * file, but we must instruct it not to close after each diff. */ rev.diffopt.no_free = 1; } else { diff --git a/git-compat-util.h b/git-compat-util.h index a508dbe5a3..df7dae9be1 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) (type *)container_of_or_null_offset(ptr, offsetof(type, member)) /* - * like offsetof(), but takes a pointer to a a variable of type which + * like offsetof(), but takes a pointer to a variable of type which * contains @member, instead of a specified type. * @ptr is subject to multiple evaluation since we can't rely on __typeof__ * everywhere. diff --git a/git-cvsserver.perl b/git-cvsserver.perl index f6f3fc192c..ed035f32c2 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2149,7 +2149,7 @@ sub req_diff ( $meta2->{revision} or "workingcopy" )); # TODO: Use --label instead of -L because -L is no longer - # documented and may go away someday. Not sure if there there are + # documented and may go away someday. Not sure if there are # versions that only support -L, which would make this change risky? # http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html # ("man diff" should actually document the best migration strategy, diff --git a/remote.c b/remote.c index 6d1e8d02df..dfb863d808 100644 --- a/remote.c +++ b/remote.c @@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, else /* * If the ref isn't stale, and is reachable - * from from one of the reflog entries of + * from one of the reflog entries of * the local branch, force the update. */ force_ref_update = 1; diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index c7b392794b..e6e3c8f552 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -182,7 +182,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch' ) ' -test_expect_success 'rename errors out early when when new name is invalid' ' +test_expect_success 'rename errors out early when new name is invalid' ' test_config remote.foo.vcs bar && echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect && test_must_fail git remote rename foo invalid...name 2>actual && diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh index 84f5082366..57be4a4cbb 100755 --- a/t/t6416-recursive-corner-cases.sh +++ b/t/t6416-recursive-corner-cases.sh @@ -871,7 +871,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file' # it feels sound to say "B and C do not agree what the final pathname # should be, but we know this content was derived from the common A:a so we # use one path whose name is arbitrary in the virtual merge base X between -# D and E" and then further let the rename detection to notice that that +# D and E" and then further let the rename detection to notice that # arbitrary path gets renamed between X-D to "newname" and X-E also to # "newname" to resolve it as both sides renaming it to the same new # name. It is akin to what we do at the content level, i.e. "B and C do not diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 1d3fdcc997..ef35a54885 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -330,7 +330,7 @@ test_expect_success 'git-svn works in a bare repository' ' git svn fetch ) && rm -rf bare-repo ' -test_expect_success 'git-svn works in in a repository with a gitdir: link' ' +test_expect_success 'git-svn works in a repository with a gitdir: link' ' mkdir worktree gitdir && ( cd worktree && git svn init "$svnrepo" && -- 2.31.1