From patchwork Sun Nov 29 19:52:19 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: 11939297 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 27732C3E8C5 for ; Sun, 29 Nov 2020 19:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D828020756 for ; Sun, 29 Nov 2020 19:53:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O6v3WMQU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727117AbgK2Txb (ORCPT ); Sun, 29 Nov 2020 14:53:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726304AbgK2Txb (ORCPT ); Sun, 29 Nov 2020 14:53:31 -0500 Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3E1FC0613D2 for ; Sun, 29 Nov 2020 11:52:50 -0800 (PST) Received: by mail-lf1-x142.google.com with SMTP id d20so16446023lfe.11 for ; Sun, 29 Nov 2020 11:52:50 -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=1KDb1UzSaXXrd0cITDJRNKDkZpbmoxR1GI0d/pIcjoY=; b=O6v3WMQUG3Dimx0ft6xWQ4F4fwRXZpPAU8Iz4ZfGrTjNj/y73WO28NK8GgSBo0YU/K jyanq0igcTlqttsllIPI+JTLiZuEYXi0hZdJrgiav171uoa+SH22VREVbuiijMGP8khI o1bT1XB3gr0aLl0vffSpfA1S2XqnU49Jci1k1Z0Bof1gUmzzS0RP3FyprvPFCCFBupbE Fk9R+nsRa64N/A668WMiNOUG1TSiRWY7oilIM//KD0tMOkWxsGiLZncNZ7gNoalalWUf 3x+8rNUTCjm8vufPu8IBgVXJ7bAr7VoPASL1LUo5bDPUnd/bar1Ppvmfvrgpcx74BErd ZAow== 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=1KDb1UzSaXXrd0cITDJRNKDkZpbmoxR1GI0d/pIcjoY=; b=XY7wsrLoDvhysTCAl9BguKVTsTjwYXSP3lwYbUT+Cel/sG5Sb4cYr1v2vESTJKipY7 iODGYsvffnzzZUQM5rjsCRQxTgAMu+r1OK6eY0fclRBIZH29N71Na89fCmOA9dfsIJq9 mSQEIhgXvybmij/hFj0VaLfLOlvHGrHX4sRERqSZXRmkI7nbT2db5wF4/8ecbxYlPVRy a/XWsVIdH0OUX/CY0gFymfPBZq24coX5Z0Pfb8P4tc9003Kh7xTzzxodmAsqbytVICMZ IBrdwqux1cWQasaPaORWO7gwQsxcCompnKKKOuHyI956ReEARhg+AP4ZpJXHsG/802bz QlrQ== X-Gm-Message-State: AOAM531Rj3uU+4ZyrxD3wdaEQ0lBYw+Do/x8UBzJetZ1hmHTvi8xU57x KFH0jmzj4Xks4te7/PtJzogersPdyYM= X-Google-Smtp-Source: ABdhPJyLun4u1H1yy8dwD4eMFCDLhh21mit9nrLX2sB+mmRLIRD41O37ELT8hTOVhTlxtM5pCHrG/w== X-Received: by 2002:a05:6512:1095:: with SMTP id j21mr7473216lfg.309.1606679569164; Sun, 29 Nov 2020 11:52:49 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id w72sm1808707lff.89.2020.11.29.11.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 11:52:48 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Junio C Hamano , Emily Shaffer , Jeff King Subject: [PATCH v3 1/4] grep: don't set up a "default" repo for grep Date: Sun, 29 Nov 2020 20:52:19 +0100 Message-Id: <1d3878799f8260968ea9f6a75a92c4daca1da133.1606679312.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 Signed-off-by: Junio C Hamano --- 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;