From patchwork Sat Jul 31 02:42:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 12412225 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 5FA0AC4338F for ; Sat, 31 Jul 2021 02:42:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 425E860EC0 for ; Sat, 31 Jul 2021 02:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231600AbhGaCmk (ORCPT ); Fri, 30 Jul 2021 22:42:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231285AbhGaCmh (ORCPT ); Fri, 30 Jul 2021 22:42:37 -0400 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9854C0613CF for ; Fri, 30 Jul 2021 19:42:30 -0700 (PDT) Received: by mail-qt1-x82f.google.com with SMTP id d9so7809448qty.12 for ; Fri, 30 Jul 2021 19:42:30 -0700 (PDT) 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=QR2byZ0ioJNuyLLImqT1+1HcGOWnBsSGex0fWFBzfts=; b=EpmqaZ2BW+K8CdU/ltqTsODRuf4srlkVSGNTPHJ6qIyXDXibNZxJLrz9wXT9Rgf6K3 9NCAMLlxX82/sTdBc+Ugs4/LKJzT5pOKJ2X9pxAVBHzfbtNwqv43uEO4wFMgYD8ebiTI CKPzcOOway2DUlhOM6biT8EttXdEWvXHTvbsMTmP9/o9V22h8VCPxflxaWoskzJ5giWI 7x5hW5oINV9cOOybuIqJLoznxdMGfqpwDrskmcb40L7BRIrASRv2FbnRmkFa2pChGazx UjjJxS3CRp6Mxp7SaJXyEY0tp3z6nTdfdi7DVYhek5cMUzab+EDUyVbsttIirITMAsAU +2Dg== 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=QR2byZ0ioJNuyLLImqT1+1HcGOWnBsSGex0fWFBzfts=; b=R2CkrST2lnq8LeDFSoyepqpJSADHBzMe2IjQTINoflq38c0JM9kToBfuD01h9CjlpD B35qNtITUsiHNplL6yr5Qz2kh1O7In4y3WTyLUG3HqPHmXJWq2a36NGP0/6g/4ELjjXc ok0VpLJZYsnuJSKH/cwW3jrOP/VPdAnXm2RQvGioz4DzdhFLtGI4l9r64jxs88oO4fK6 Ny9D5fipL2T9/FcwoE+02kSFdKkt2tA53uk9PkDjKoa2OLn9tAQ+cSEmMQhJKEjF2aFD EuAZxbg6ux5qfo9gaPWg335c4az0KY8mEy/P0TnxNlnTUzVNPzZH1BY+DMoaOh17ROUQ 64WA== X-Gm-Message-State: AOAM533I04Ls62Z7dfb4k5t7lHz8KpIY4z1lQ0f2QP8QiVEnaHssR/95 A/3/scg02YdVViIXJeEtcsQlX02HGu4g+A== X-Google-Smtp-Source: ABdhPJzPaZzrFndDRFidalI0/fHzGwgn0/EMXZMnRoUXBQRLH7G3CZNeJLhf1FGvjIzFL/JEIr3ZXA== X-Received: by 2002:ac8:6611:: with SMTP id c17mr4986300qtp.392.1627699349906; Fri, 30 Jul 2021 19:42:29 -0700 (PDT) Received: from localhost ([24.169.20.255]) by smtp.gmail.com with ESMTPSA id d25sm1452881qtq.55.2021.07.30.19.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 19:42:29 -0700 (PDT) From: Ben Boeckel To: git@vger.kernel.org Cc: Ben Boeckel , Jeff King , Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= Subject: [PATCH v1 1/6] branch: move `git_default_branch_config` to `branch.c` Date: Fri, 30 Jul 2021 22:42:16 -0400 Message-Id: <20210731024221.2113906-2-mathstuf@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731024221.2113906-1-mathstuf@gmail.com> References: <20210731024221.2113906-1-mathstuf@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This allows branch-specific variables to be tracked locally in `branch.c` instead of globally in `environment.c`. Signed-off-by: Ben Boeckel --- branch.c | 32 ++++++++++++++++++++++++++++++++ branch.h | 5 +++++ cache.h | 1 - config.c | 30 ------------------------------ environment.c | 1 - 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/branch.c b/branch.c index 7a88a4861e..1ef52db89d 100644 --- a/branch.c +++ b/branch.c @@ -9,6 +9,38 @@ #include "commit.h" #include "worktree.h" +static enum rebase_setup_type autorebase = AUTOREBASE_NEVER; + +int git_default_branch_config(const char *var, const char *value) +{ + if (!strcmp(var, "branch.autosetupmerge")) { + if (value && !strcasecmp(value, "always")) { + git_branch_track = BRANCH_TRACK_ALWAYS; + return 0; + } + git_branch_track = git_config_bool(var, value); + return 0; + } + if (!strcmp(var, "branch.autosetuprebase")) { + if (!value) + return config_error_nonbool(var); + else if (!strcmp(value, "never")) + autorebase = AUTOREBASE_NEVER; + else if (!strcmp(value, "local")) + autorebase = AUTOREBASE_LOCAL; + else if (!strcmp(value, "remote")) + autorebase = AUTOREBASE_REMOTE; + else if (!strcmp(value, "always")) + autorebase = AUTOREBASE_ALWAYS; + else + return error(_("malformed value for %s"), var); + return 0; + } + + /* Add other config variables here and to Documentation/config.txt. */ + return 0; +} + struct tracking { struct refspec_item spec; char *src; diff --git a/branch.h b/branch.h index df0be61506..801ff25f92 100644 --- a/branch.h +++ b/branch.h @@ -17,6 +17,11 @@ extern enum branch_track git_branch_track; /* Functions for acting on the information about branches. */ +/* + * Parses branch-related configuration options. + */ +int git_default_branch_config(const char *var, const char *value); + /* * Creates a new branch, where: * diff --git a/cache.h b/cache.h index ba04ff8bd3..6ea1ea5854 100644 --- a/cache.h +++ b/cache.h @@ -1030,7 +1030,6 @@ enum push_default_type { PUSH_DEFAULT_UNSPECIFIED }; -extern enum rebase_setup_type autorebase; extern enum push_default_type push_default; enum object_creation_mode { diff --git a/config.c b/config.c index f33abeab85..840be51710 100644 --- a/config.c +++ b/config.c @@ -1574,36 +1574,6 @@ static int git_default_i18n_config(const char *var, const char *value) return 0; } -static int git_default_branch_config(const char *var, const char *value) -{ - if (!strcmp(var, "branch.autosetupmerge")) { - if (value && !strcasecmp(value, "always")) { - git_branch_track = BRANCH_TRACK_ALWAYS; - return 0; - } - git_branch_track = git_config_bool(var, value); - return 0; - } - if (!strcmp(var, "branch.autosetuprebase")) { - if (!value) - return config_error_nonbool(var); - else if (!strcmp(value, "never")) - autorebase = AUTOREBASE_NEVER; - else if (!strcmp(value, "local")) - autorebase = AUTOREBASE_LOCAL; - else if (!strcmp(value, "remote")) - autorebase = AUTOREBASE_REMOTE; - else if (!strcmp(value, "always")) - autorebase = AUTOREBASE_ALWAYS; - else - return error(_("malformed value for %s"), var); - return 0; - } - - /* Add other config variables here and to Documentation/config.txt. */ - return 0; -} - static int git_default_push_config(const char *var, const char *value) { if (!strcmp(var, "push.default")) { diff --git a/environment.c b/environment.c index 2f27008424..5d45152731 100644 --- a/environment.c +++ b/environment.c @@ -60,7 +60,6 @@ int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN; char *check_roundtrip_encoding = "SHIFT-JIS"; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; enum branch_track git_branch_track = BRANCH_TRACK_REMOTE; -enum rebase_setup_type autorebase = AUTOREBASE_NEVER; enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED; #ifndef OBJECT_CREATION_MODE #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS From patchwork Sat Jul 31 02:42:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 12412229 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 84D44C4338F for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 634C060F48 for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231682AbhGaCml (ORCPT ); Fri, 30 Jul 2021 22:42:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231453AbhGaCmi (ORCPT ); Fri, 30 Jul 2021 22:42:38 -0400 Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07CADC06175F for ; Fri, 30 Jul 2021 19:42:32 -0700 (PDT) Received: by mail-qv1-xf32.google.com with SMTP id x12so6209307qvo.12 for ; Fri, 30 Jul 2021 19:42:31 -0700 (PDT) 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=uV8rbFZ3ElcotGxBhDYSXLHyZKRBbis9T9URYhw1oek=; b=HoQhVpAoVf8xwzytLvXlWQFE08W+GPOQXg1TfvAn1K6Ucs7vItKlNFCcMfuXHVOQOs 88NFP+iHJjOI+r5A12srV9ToKisZFsVAN75xD+TMz3rUbn2bUXRM/hfWhvwnLbKz/RbG qPcVJQ6kELGSICDADhdkBqaWr5q3antd1C79Aiw8VTJBfDjx1BaJn8zH0ew+6vaj9XpF OtBmKbAyWFSz3YVV9mDkbXqOE4bk/Cg9Q7PPPrkAmdzrpT2JpTtKAt+QsWQ9Bo+nJlzk F58yt//xMWjleEKTRNDLWgnS9V7ShH/y5VgQvHrrP763KDaUcjAQzdJ2I0hwu3T+PvmH PvDQ== 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=uV8rbFZ3ElcotGxBhDYSXLHyZKRBbis9T9URYhw1oek=; b=D8jIM8+nRqA0BoyReYz1w/8DM3R6Ml4Mo8b3Tje3lbDxqqlM9UIX/nDq7XxgH2+TYI Y9f2buJDgPZvjgr8XRXaIgO7AJ90ELYCbRZ6G6u+4JaccagAnl/vqGxIkuwDBKGb8z63 uSRSyqNig++VqU8FK2KIW7soe1GCCQiS/lZ9W5D3xA4j1gCyoiD36VegPobeBytcIeVg uXeORsiRnvgyPDaNrDWbJpNBaQwb4Up3yv1xPEToftO93oWD1XxnUNFn8yKbSvQS0S3j bEuGLAx08+JKteNQjbdygmPyYvHu4mNWXHBINL+Efg94TPnytad6sU2e8z/2s3LSj4Bj p2hA== X-Gm-Message-State: AOAM532G4FIzGLaxf1Bo74iS2NkL84htv5Gv6WRrd6YuVTXXh4njRPg4 4zrjw2PhnNksWdiZPLJVlBXdprGW4PoRYg== X-Google-Smtp-Source: ABdhPJx57IlkZvvbfMTKrzgaOGrFWI9sbmrZjEOkJg+OWinMOf8sLdQjRlhJ5bkphH89WQRalh4T3w== X-Received: by 2002:a0c:e88f:: with SMTP id b15mr6192059qvo.8.1627699351064; Fri, 30 Jul 2021 19:42:31 -0700 (PDT) Received: from localhost ([24.169.20.255]) by smtp.gmail.com with ESMTPSA id o2sm1917600qkm.109.2021.07.30.19.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 19:42:30 -0700 (PDT) From: Ben Boeckel To: git@vger.kernel.org Cc: Ben Boeckel , Jeff King , Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= Subject: [PATCH v1 2/6] mailmap: move `git_default_mailmap_config` to `mailmap.c` Date: Fri, 30 Jul 2021 22:42:17 -0400 Message-Id: <20210731024221.2113906-3-mathstuf@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731024221.2113906-1-mathstuf@gmail.com> References: <20210731024221.2113906-1-mathstuf@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This allows mailmap-specific variables to be tracked locally in `mailmap.c` instead of globally. Signed-off-by: Ben Boeckel --- cache.h | 2 -- config.c | 12 +----------- mailmap.c | 16 ++++++++++++++-- mailmap.h | 2 ++ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cache.h b/cache.h index 6ea1ea5854..551a6cb5cf 100644 --- a/cache.h +++ b/cache.h @@ -1718,8 +1718,6 @@ int author_ident_sufficiently_given(void); extern const char *git_commit_encoding; extern const char *git_log_output_encoding; -extern const char *git_mailmap_file; -extern const char *git_mailmap_blob; /* IO helper functions */ void maybe_flush_or_die(FILE *, const char *); diff --git a/config.c b/config.c index 840be51710..c45001adbe 100644 --- a/config.c +++ b/config.c @@ -15,6 +15,7 @@ #include "strbuf.h" #include "quote.h" #include "hashmap.h" +#include "mailmap.h" #include "string-list.h" #include "object-store.h" #include "utf8.h" @@ -1603,17 +1604,6 @@ static int git_default_push_config(const char *var, const char *value) return 0; } -static int git_default_mailmap_config(const char *var, const char *value) -{ - if (!strcmp(var, "mailmap.file")) - return git_config_pathname(&git_mailmap_file, var, value); - if (!strcmp(var, "mailmap.blob")) - return git_config_string(&git_mailmap_blob, var, value); - - /* Add other config variables here and to Documentation/config.txt. */ - return 0; -} - int git_default_config(const char *var, const char *value, void *cb) { if (starts_with(var, "core.")) diff --git a/mailmap.c b/mailmap.c index d1f7c0d272..e1d9a2bbdb 100644 --- a/mailmap.c +++ b/mailmap.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "config.h" #include "string-list.h" #include "mailmap.h" #include "object-store.h" @@ -12,8 +13,19 @@ static inline void debug_mm(const char *format, ...) {} static inline const char *debug_str(const char *s) { return s; } #endif -const char *git_mailmap_file; -const char *git_mailmap_blob; +static const char *git_mailmap_file; +static const char *git_mailmap_blob; + +int git_default_mailmap_config(const char *var, const char *value) +{ + if (!strcmp(var, "mailmap.file")) + return git_config_pathname(&git_mailmap_file, var, value); + if (!strcmp(var, "mailmap.blob")) + return git_config_string(&git_mailmap_blob, var, value); + + /* Add other config variables here and to Documentation/config.txt. */ + return 0; +} struct mailmap_info { char *name; diff --git a/mailmap.h b/mailmap.h index 7e99fccb46..48bfe9fac7 100644 --- a/mailmap.h +++ b/mailmap.h @@ -3,6 +3,8 @@ struct string_list; +int git_default_mailmap_config(const char *var, const char *value); + int read_mailmap(struct string_list *map); void clear_mailmap(struct string_list *map); From patchwork Sat Jul 31 02:42:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 12412227 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 93670C4320A for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F78260E09 for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234655AbhGaCmm (ORCPT ); Fri, 30 Jul 2021 22:42:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231462AbhGaCmi (ORCPT ); Fri, 30 Jul 2021 22:42:38 -0400 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25144C0613D3 for ; Fri, 30 Jul 2021 19:42:33 -0700 (PDT) Received: by mail-qk1-x733.google.com with SMTP id k7so11302963qki.11 for ; Fri, 30 Jul 2021 19:42:33 -0700 (PDT) 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=HNYVQWMat+KPgO74MK+N8jTAoNvDTlqr2bfJREHgCvc=; b=dWsC+wbOIFkel43cxHknSy51a9OyzPfNXfGNE4PYXMZMcMwrz0lRd5tsW/SMcC4JZb g9pJWV8L5yflAbPPtXyYsxl1kTbTAb8zyNx9mjV+U2Q8tCODesZc2yeMxBgYryn37/Yv mZTT4aVJoTAnzaj9Y2ylXDKD9T2jeHzUiNmEEhYRs8eVdu0yxAuoYQFr0mAgxzayKJVY f+Jm7yNe08rxfPNgZ78gjRIwfO52yJ6Xu3zepZgYCacvRcik0w8i26ovHMLVsX8RXSlN Pq7QbgXe4rBxcGaB6B3LDOlI2PTVyCNH4QdvdJhffxd6KMjVSZzMYjJygpd5oyrOjmia YSFQ== 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=HNYVQWMat+KPgO74MK+N8jTAoNvDTlqr2bfJREHgCvc=; b=mj9Gw060FeYe2LIScDQHw+GqrmBeV+xqQGXt6egf/vy6LcVG7PooU/2BXnMJXmfrL7 Gw1seaGbAgjWJXe0sIW8otrO2g5xmPFEaryfbEbSw9PO/16uZTvug+wAjxXKwQzUKTCS urSUfoTFSJpYxClP0W4/4smZ6EV+Ww9xBMznSyVmuueP/IatRbJLSanouDgPofvQcGTa RrAhiw3zTYTTy2q3EUHqI7myXCy+X4qbL0KnlRn//NBJLvYAsgn2WhJcfGE1wQxEdYcA pY9hHRCgXHlLN0FzIHynyPG/Pft2ZWxYvU7fOgGNRj/C6dhp0g/vXubP949E51pI653f 7MOA== X-Gm-Message-State: AOAM530gvUR8VkrU1Z8TIywGrvixTrXndpKbvCnVzAl2LX69LqSsxfq2 Yn/GmJR1v7NVKgjG8syHjGPfD97uGZFVJA== X-Google-Smtp-Source: ABdhPJwGuI9Ko9RxZnSdtPSrwQJIg9Ug1iLw6XxbKUS3iBuEBFrdjEkjH9qH7OImLbE0i4uOVYFx6Q== X-Received: by 2002:a37:9d41:: with SMTP id g62mr5399888qke.55.1627699352191; Fri, 30 Jul 2021 19:42:32 -0700 (PDT) Received: from localhost ([24.169.20.255]) by smtp.gmail.com with ESMTPSA id o63sm1944318qkf.4.2021.07.30.19.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 19:42:31 -0700 (PDT) From: Ben Boeckel To: git@vger.kernel.org Cc: Ben Boeckel , Jeff King , Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= Subject: [PATCH v1 3/6] apply: move `apply_default_*whitespace` to `apply.c` Date: Fri, 30 Jul 2021 22:42:18 -0400 Message-Id: <20210731024221.2113906-4-mathstuf@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731024221.2113906-1-mathstuf@gmail.com> References: <20210731024221.2113906-1-mathstuf@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org These variables are only set and used in this file, so they can become `static`. Signed-off-by: Ben Boeckel --- apply.c | 3 +++ cache.h | 2 -- environment.c | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apply.c b/apply.c index 44bc31d6eb..15dcd8b7d7 100644 --- a/apply.c +++ b/apply.c @@ -23,6 +23,9 @@ #include "apply.h" #include "entry.h" +static char *apply_default_whitespace; +static char *apply_default_ignorewhitespace; + struct gitdiff_data { struct strbuf *root; int linenr; diff --git a/cache.h b/cache.h index 551a6cb5cf..dc6c4172cb 100644 --- a/cache.h +++ b/cache.h @@ -944,8 +944,6 @@ extern int assume_unchanged; extern int prefer_symlink_refs; extern int warn_ambiguous_refs; extern int warn_on_object_refname_ambiguity; -extern char *apply_default_whitespace; -extern char *apply_default_ignorewhitespace; extern const char *git_attributes_file; extern const char *git_hooks_path; extern int zlib_compression_level; diff --git a/environment.c b/environment.c index 5d45152731..0cc086d847 100644 --- a/environment.c +++ b/environment.c @@ -36,8 +36,6 @@ int repository_format_precious_objects; int repository_format_worktree_config; const char *git_commit_encoding; const char *git_log_output_encoding; -char *apply_default_whitespace; -char *apply_default_ignorewhitespace; const char *git_attributes_file; const char *git_hooks_path; int zlib_compression_level = Z_BEST_SPEED; From patchwork Sat Jul 31 02:42:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 12412231 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 9DF51C432BE for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85ACC60F3A for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235199AbhGaCmn (ORCPT ); Fri, 30 Jul 2021 22:42:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231551AbhGaCmk (ORCPT ); Fri, 30 Jul 2021 22:42:40 -0400 Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A8DCC0613D5 for ; Fri, 30 Jul 2021 19:42:34 -0700 (PDT) Received: by mail-qt1-x833.google.com with SMTP id w10so7837893qtj.3 for ; Fri, 30 Jul 2021 19:42:34 -0700 (PDT) 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=OpoQv5mOA6yN9dq+be8uJ4RXYBMz5qDd7+3Oby+OUaw=; b=DJnMjaP+ATodEQZy5FoS9Xizt0SEO3guqlCDDiTaUsWou/fWjqcSe0NLtD0zyvxKq6 0WwICpMj7V/gYW9RIBLzh7k3iFfk1JUFNuUT0BRt2VedX0g2nhgOSSb6RwSC3o+ogf+G 2IPWOr7XXgA5wXORIc+uYuhrDfeE4r5m9Qi/GTwAC5mMWU9Ej448NNTWhazoTsgWxwL9 8TpSKEDRoBMwROu5mhOGGj4EEVw+b7vkbvUL76uh5AoYCLOTiqq4s4mlKztLKX5A2Cde elcM8/JLV4DXdIemATG+zQxgFWovIxDHXTpN0qvTPe8igH14J/IYLM94C5AtBk5Z6Q7c vbUw== 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=OpoQv5mOA6yN9dq+be8uJ4RXYBMz5qDd7+3Oby+OUaw=; b=iXS6Zp3wOCBkzLXfq4v1s83VuUw2vnPSiMVqrJsR356RXnw0HUyspfiAHCK4hYvOhp vuzZC+G27F2Y1YDO2rogq0ceg/ZFc049Xc81PDCh3wf7/iqnF+8DvqcALP0wGHOiFRM9 rPRuiydBjrp4dtG8O+KqqVnyQuxWjbBY4GDsKWdO6AWqtcQ51rkGqZH/e2jk/MBdHI3E 3bRdBI588q6xlUB92W0Xrpwi/talX8s6fM5w1Cqltp5pXWrgy+Wr9uaBkoCiQAqdYyD8 oq1+Hm77QWlRKHZwoUVdkK1mh5MHWNASnz6PExS6DNrZRNchnydhHPLDfXxLzCHiwDrR IdGA== X-Gm-Message-State: AOAM530LIMebgl1JjJm+oRPWljBryODGUS7ee5bYrb5Y6t2ThK/XmlT3 nA3o2Ribulec8OuoxjCcPwJHC3c3il6Aew== X-Google-Smtp-Source: ABdhPJztNKMm0bPpndIkxonqVsZD9hHu8krqa204FGWFFPOIWJWppdF/mPrJiofCgVxeMffDvaquCQ== X-Received: by 2002:ac8:7d44:: with SMTP id h4mr5005068qtb.101.1627699353331; Fri, 30 Jul 2021 19:42:33 -0700 (PDT) Received: from localhost ([24.169.20.255]) by smtp.gmail.com with ESMTPSA id t25sm1880771qkt.11.2021.07.30.19.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 19:42:33 -0700 (PDT) From: Ben Boeckel To: git@vger.kernel.org Cc: Ben Boeckel , Jeff King , Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= Subject: [PATCH v1 4/6] config: remove `core_compression_level` Date: Fri, 30 Jul 2021 22:42:19 -0400 Message-Id: <20210731024221.2113906-5-mathstuf@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731024221.2113906-1-mathstuf@gmail.com> References: <20210731024221.2113906-1-mathstuf@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This variable is just stored to after parsing `core.compression` and then ignored, so it can just be completely removed. Signed-off-by: Ben Boeckel --- cache.h | 1 - config.c | 1 - environment.c | 1 - 3 files changed, 3 deletions(-) diff --git a/cache.h b/cache.h index dc6c4172cb..4fd134863c 100644 --- a/cache.h +++ b/cache.h @@ -947,7 +947,6 @@ extern int warn_on_object_refname_ambiguity; extern const char *git_attributes_file; extern const char *git_hooks_path; extern int zlib_compression_level; -extern int core_compression_level; extern int pack_compression_level; extern size_t packed_git_window_size; extern size_t packed_git_limit; diff --git a/config.c b/config.c index c45001adbe..b241a56cfb 100644 --- a/config.c +++ b/config.c @@ -1401,7 +1401,6 @@ static int git_default_core_config(const char *var, const char *value, void *cb) level = Z_DEFAULT_COMPRESSION; else if (level < 0 || level > Z_BEST_COMPRESSION) die(_("bad zlib compression level %d"), level); - core_compression_level = level; core_compression_seen = 1; if (!zlib_compression_seen) zlib_compression_level = level; diff --git a/environment.c b/environment.c index 0cc086d847..3b995434fc 100644 --- a/environment.c +++ b/environment.c @@ -39,7 +39,6 @@ const char *git_log_output_encoding; const char *git_attributes_file; const char *git_hooks_path; int zlib_compression_level = Z_BEST_SPEED; -int core_compression_level; int pack_compression_level = Z_DEFAULT_COMPRESSION; int fsync_object_files; size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE; From patchwork Sat Jul 31 02:42:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 12412233 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 AA13FC43214 for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91FCC60F48 for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235347AbhGaCmn (ORCPT ); Fri, 30 Jul 2021 22:42:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231922AbhGaCml (ORCPT ); Fri, 30 Jul 2021 22:42:41 -0400 Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DBB9C0613CF for ; Fri, 30 Jul 2021 19:42:35 -0700 (PDT) Received: by mail-qk1-x72e.google.com with SMTP id z24so11324226qkz.7 for ; Fri, 30 Jul 2021 19:42:35 -0700 (PDT) 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=2SOG30/d0ZGikAwj+Wg7HmIq6SgvCz4L9If8obMIjD8=; b=K5YazMMSfKCZJQWEAJZuN9QnIzor2+ZKQZl6D7wQAQK6OqnpKZuM9S74rhMME1QTML lhuuooyDQYOjByWrmHfc3hT3RERBjFmD+fSy1OoW7JW3TWRg3uzx3fdV3XE61iyI8DSJ Nw0smBzzc6uU/d6w88qmxObAwtQRMVEmgj+Wpmv1CtG4tC3OHFWC5b3lXOZeOWbkSwj3 B4p4784TavirUbOjbWl0tQ4/dpsPNdZeoPvG5Qk27fIlxFGDJbPCXI27resKAccByZCN BDpB5KknndYz90fuzsGQbjzQh20GqAOZ84uUZXj+Fno06IS8BnuYFetLfO6JIfbupPeM 8QoQ== 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=2SOG30/d0ZGikAwj+Wg7HmIq6SgvCz4L9If8obMIjD8=; b=i4nK58fYN3SlDR5VUXGGr0wXm4peYU1Gajc0CK7SyoiwsxcUrEtBMzb2nZw47KpCz+ i2TqfUeG9a9Zc2jinHmsKP183toixKllhSOFQw4e26D+38p79Mutaka3gdBJIRdhLruJ LIpI5hXKwaf3cvZKwh2kghDSIMVtmve5SY46wf6lIjqZ6NRd2EDFjTPILfxqtj4SoJeb 8Bka2wrTXyMHPrQGzvbKt0296fuc+KhhbYSNxiWW3qKcnzZfKAYiC108UXEJ7Hecydhs jNUIG4E9lT1q8BYAlyd8m+CxCddd6CrbxXunDbwpfrM5LW50S7R08AdF7T6dAcYAndXf NeTA== X-Gm-Message-State: AOAM531C72rT8tOLhF5fr3zrH0W7u+1RlA3bSXqVo2ZcUkxWnjnRnYhU wm7YGsobn/m0kw7ASL4c454URSbG1p2mXQ== X-Google-Smtp-Source: ABdhPJxg7uSgF/5qIhxfevH3zFo7K7ALPELLpEhDgKgthSHoP7wALz2apWL6/i3OAOeV0nTBnc5qbQ== X-Received: by 2002:a37:46d0:: with SMTP id t199mr5211508qka.416.1627699354411; Fri, 30 Jul 2021 19:42:34 -0700 (PDT) Received: from localhost ([24.169.20.255]) by smtp.gmail.com with ESMTPSA id m14sm1841807qka.62.2021.07.30.19.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 19:42:34 -0700 (PDT) From: Ben Boeckel To: git@vger.kernel.org Cc: Ben Boeckel , Jeff King , Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= Subject: [PATCH v1 5/6] refs/debug: declare file-local variable to be static Date: Fri, 30 Jul 2021 22:42:20 -0400 Message-Id: <20210731024221.2113906-6-mathstuf@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731024221.2113906-1-mathstuf@gmail.com> References: <20210731024221.2113906-1-mathstuf@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Declaring a variable in a source file as `extern` and then defining it later is not very useful. It can instead be declared as `static`. Signed-off-by: Ben Boeckel --- refs/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/refs/debug.c b/refs/debug.c index 7db4abccc3..f5609408f3 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -9,7 +9,7 @@ struct debug_ref_store { struct ref_store *refs; }; -extern struct ref_storage_be refs_be_debug; +static struct ref_storage_be refs_be_debug; struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_store *store) { @@ -413,7 +413,7 @@ static int debug_reflog_expire(struct ref_store *ref_store, const char *refname, return res; } -struct ref_storage_be refs_be_debug = { +static struct ref_storage_be refs_be_debug = { NULL, "debug", NULL, From patchwork Sat Jul 31 02:42:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 12412235 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 B5138C4320E for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E2DF60E09 for ; Sat, 31 Jul 2021 02:42:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235505AbhGaCmp (ORCPT ); Fri, 30 Jul 2021 22:42:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231862AbhGaCml (ORCPT ); Fri, 30 Jul 2021 22:42:41 -0400 Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 524EDC0613D3 for ; Fri, 30 Jul 2021 19:42:36 -0700 (PDT) Received: by mail-qt1-x834.google.com with SMTP id g11so7811952qts.11 for ; Fri, 30 Jul 2021 19:42:36 -0700 (PDT) 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=Q1SyOISdkElOPM7n0bzDUfpIASL6wpbMQYplYMMY2wk=; b=VaicHJ2giloDsDX3bdU4UU2nho1OYLtJQGSj4Q0dsEAoQ8snLg0Fc7ocbmkG5a2I7P 2oj3qOlAeQpBOuYINGXjkwtzobWNQ3qDJ8IMnVpLZu4FhminQs/cWjaIKO75pX4alabU OMf5QzU441TTrPZNtRynKLrMjuQY3ZV7s3x+2gBcJofHyV+goWCjjChigXmdBeH3qCuy Gcr6SLxixTPQ39BiFNNu0ALFNGu21LUea797qotkyMVWf9WvLnIQfg/0l1L82G9F7zW6 9dm5JKyfZ+icZXeWd/uO0TrQUnIS4btMOESdqte6eCHZ7XfMdBC1QsjPhMpTWiWgoZ3q Oirg== 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=Q1SyOISdkElOPM7n0bzDUfpIASL6wpbMQYplYMMY2wk=; b=U3KAG3tmTpf0MaFqkNzL3Or5pbSD7+ffr/FDYzTDEjf3JOpn9tHfhj/hMpUXOSRvol AW50nmJgVvbULSPAJZ6Fhufhiwhyyxub/yV54NDo/LGNdBTPbYB/6+LlENf+dN+FJug2 /bSFCiIAjnpCEnAEDZXPPDZNASXxxFEpUsOCnF8w1OLlz7PBmTCtRhLDa/TQ5oB85VNL mLp1kZ/kRQYW9BqVH954XYMU0FJLpAZUNKbkrB80v3SXh3Hg0EZtyMHEbrFx8bwL+NXn 3qb3x9kzhPHUMFQxY0l0pYD7cSwxqZi4JK9oov5XG+BvUGsi5zBFfg1N2BGEs6NZ5ohF YCVQ== X-Gm-Message-State: AOAM532nD1UfRQV4WChplRGLDvz3iXyecz4lS8dOrW79m0wdx9neYz3L fFNxZMyoobnGPsGZYsvLrSgz/8AmPlFjgQ== X-Google-Smtp-Source: ABdhPJxCK68TGaEA85bPYzHaQZ25qZIyXKPh4OlRjHSaf8Uoczd7dqp34l5e901y42qSnNJTAHwxVQ== X-Received: by 2002:ac8:7388:: with SMTP id t8mr5043805qtp.96.1627699355410; Fri, 30 Jul 2021 19:42:35 -0700 (PDT) Received: from localhost ([24.169.20.255]) by smtp.gmail.com with ESMTPSA id w20sm1958498qkj.27.2021.07.30.19.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 19:42:35 -0700 (PDT) From: Ben Boeckel To: git@vger.kernel.org Cc: Ben Boeckel , Jeff King , Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= Subject: [PATCH v1 6/6] globals: remove explicit `0` initialization from globals Date: Fri, 30 Jul 2021 22:42:21 -0400 Message-Id: <20210731024221.2113906-7-mathstuf@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731024221.2113906-1-mathstuf@gmail.com> References: <20210731024221.2113906-1-mathstuf@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Git relies on implicit zero-initialization of global variables. Signed-off-by: Ben Boeckel --- object-file.c | 2 +- progress.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/object-file.c b/object-file.c index ecca5a8da0..6a04013342 100644 --- a/object-file.c +++ b/object-file.c @@ -1503,7 +1503,7 @@ static int loose_object_info(struct repository *r, return (status < 0) ? status : 0; } -int obj_read_use_lock = 0; +int obj_read_use_lock; pthread_mutex_t obj_read_mutex; void enable_obj_read_lock(void) diff --git a/progress.c b/progress.c index 680c6a8bf9..4fb4233b67 100644 --- a/progress.c +++ b/progress.c @@ -52,7 +52,7 @@ static volatile sig_atomic_t progress_update; * for 'test-tool progress'. */ int progress_testing; -uint64_t progress_test_ns = 0; +uint64_t progress_test_ns; void progress_test_force_update(void) { progress_update = 1;