From patchwork Sat Nov 21 18:31:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11923601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D582C388F9 for ; Sat, 21 Nov 2020 18:31:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1084522202 for ; Sat, 21 Nov 2020 18:31:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qEpGqL8n" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728188AbgKUSbk (ORCPT ); Sat, 21 Nov 2020 13:31:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727298AbgKUSbj (ORCPT ); Sat, 21 Nov 2020 13:31:39 -0500 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55DF0C0613CF for ; Sat, 21 Nov 2020 10:31:39 -0800 (PST) Received: by mail-lj1-x243.google.com with SMTP id l10so13570358lji.4 for ; Sat, 21 Nov 2020 10:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MpzEtaiZqKT0T5CsKXtV24LR2pR24pv/lx03VIGA7iI=; b=qEpGqL8nR9amI0ib+g/DDr49kN7FAfgifH1lweA1OnQGkJPad/mWfa3A3ysBrLJ9X0 5CFNbSTj2He/cLd9x9/Qyye6nhczm+lbiEHe26C2FMtSJYjgCCGIgt7UtlCgJ87Np32D /zGcr5wMcGC03hVgGoZC6RdH3NM+O6rVX321jxx87+qfbQV4xIvP0lVIHdYH7iT8xtgE 5QU44YkDxqD5C26KV0MRe5ZCPS1h0FBmGwphndOCq9R12Aqfqgx83ZXKpo3JWlRXOhJi v97yeMKiB4g2SRkVigalw4Ts21IFSF1QRwuz7/DTmwUUzyztZ5vxkOch4TUSYS0Swkoz PRzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MpzEtaiZqKT0T5CsKXtV24LR2pR24pv/lx03VIGA7iI=; b=aQI379jlopu+eM7cIMPKWYtKFRVOPGZAztBt/EQaheyGXuLN95oWfx6ntLbEu4vOq1 wLdH9YNhZVItvwPkYiv3PGw8dDpe7z9t4CPrdU90bGw31OABN8xYGc67wpQFG84FR/dg HRqjOCz9bUgyjRPRS1nvSUxWqrMAEoqpsDJNaFVRNSS7w5eF/cjsz+s9uybqJyO/yE5J xt3szO/M5oBSQyB980j0H1Jr2S7roxsqGY0695DnzZctNWdN7OZdH4sLJBRC1zt+iqzt TJTJc3Ef7wDWxpRkPNkwEE3nUCsFLeZSp9ogOvkZ5fCEz9J3td+EvUIdas8xO4h2UiiT SraQ== X-Gm-Message-State: AOAM530oY6k6QHBmYtz0m/phcPuuDQRXbnp2BS/TGm4A8TTl3qZSIPzc MTco02ND4ZOJ+4G5dXTljCjiEw8tTSaL0g== X-Google-Smtp-Source: ABdhPJyBh+0UHxi7CHzPwlgVpqctzRrNN5uf4xhgRV/Ji3rOgmo8ccwCcl1Fc3axJ8dMcft0FAK+Cw== X-Received: by 2002:a2e:9046:: with SMTP id n6mr10924251ljg.22.1605983497577; Sat, 21 Nov 2020 10:31:37 -0800 (PST) Received: from localhost.localdomain (h-79-136-100-70.NA.cust.bahnhof.se. [79.136.100.70]) by smtp.gmail.com with ESMTPSA id m7sm786531lfj.113.2020.11.21.10.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Nov 2020 10:31:37 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Junio C Hamano , Emily Shaffer , Jeff King Subject: [PATCH 1/4] grep: don't set up a "default" repo for grep Date: Sat, 21 Nov 2020 19:31:07 +0100 Message-Id: <02c9c38f53cc6b1faa0b58e846f9f1f36c6a3df1.1605972564.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org `init_grep_defaults()` fills a `static struct grep_opt grep_defaults`. This struct is then used by `grep_init()` as a blueprint for other such structs. Notably, `grep_init()` takes a `struct repo *` and assigns it into the target struct. As a result, it is unnecessary for us to take a `struct repo *` in `init_grep_defaults()` as well. We assign it into the default struct and never look at it again. And in light of how we return early if we have already set up the default struct, it's not just unnecessary, but is also a bit confusing: If we are called twice and with different repos, is it a bug or a feature that we ignore the second repo? Drop the repo parameter for `init_grep_defaults()`. Signed-off-by: Martin Ågren --- Documentation/MyFirstObjectWalk.txt | 2 +- grep.h | 2 +- builtin/grep.c | 2 +- builtin/log.c | 2 +- grep.c | 3 +-- revision.c | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt index c3f2d1a831..85434d1938 100644 --- a/Documentation/MyFirstObjectWalk.txt +++ b/Documentation/MyFirstObjectWalk.txt @@ -394,7 +394,7 @@ First some setup. Add `init_grep_defaults()` to `init_walken_defaults()` and add ---- static void init_walken_defaults(void) { - init_grep_defaults(the_repository); + init_grep_defaults(); } ... diff --git a/grep.h b/grep.h index 9115db8515..1c5478f381 100644 --- a/grep.h +++ b/grep.h @@ -170,7 +170,7 @@ struct grep_opt { void *output_priv; }; -void init_grep_defaults(struct repository *); +void init_grep_defaults(void); int grep_config(const char *var, const char *value, void *); void grep_init(struct grep_opt *, struct repository *repo, const char *prefix); void grep_destroy(void); diff --git a/builtin/grep.c b/builtin/grep.c index e58e57504c..2b96efa8c2 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -950,7 +950,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_END() }; - init_grep_defaults(the_repository); + init_grep_defaults(); git_config(grep_cmd_config, NULL); grep_init(&opt, the_repository, prefix); diff --git a/builtin/log.c b/builtin/log.c index 49eb8f6431..eee4beca4d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -131,7 +131,7 @@ static int log_line_range_callback(const struct option *option, const char *arg, static void init_log_defaults(void) { - init_grep_defaults(the_repository); + init_grep_defaults(); init_diff_ui_defaults(); decoration_style = auto_decoration_style(); diff --git a/grep.c b/grep.c index 54af9f813e..b351449f7f 100644 --- a/grep.c +++ b/grep.c @@ -57,7 +57,7 @@ static void color_set(char *dst, const char *color_bytes) * We could let the compiler do this, but without C99 initializers * the code gets unwieldy and unreadable, so... */ -void init_grep_defaults(struct repository *repo) +void init_grep_defaults(void) { struct grep_opt *opt = &grep_defaults; static int run_once; @@ -67,7 +67,6 @@ void init_grep_defaults(struct repository *repo) run_once++; memset(opt, 0, sizeof(*opt)); - opt->repo = repo; opt->relative = 1; opt->pathname = 1; opt->max_depth = -1; diff --git a/revision.c b/revision.c index aa62212040..f35ea1db11 100644 --- a/revision.c +++ b/revision.c @@ -1834,7 +1834,7 @@ void repo_init_revisions(struct repository *r, revs->commit_format = CMIT_FMT_DEFAULT; revs->expand_tabs_in_log_default = 8; - init_grep_defaults(revs->repo); + init_grep_defaults(); grep_init(&revs->grep_filter, revs->repo, prefix); revs->grep_filter.status_only = 1;