From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: gitster@pobox•com, ps@pks•im, atthewhughes934@gmail•com,
johannes.schindelin@gmx•de, Derrick Stolee <stolee@gmail•com>,
Derrick Stolee <stolee@gmail•com>
Subject: [PATCH 4/5] scalar: alphabetize and simplify config
Date: Wed, 26 Nov 2025 22:18:35 +0000 [thread overview]
Message-ID: <9b8ce6ba2bcc802ae38b2e1223d7d93b03fb2a1b.1764195516.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2010.git.1764195516.gitgitgadget@gmail.com>
From: Derrick Stolee <stolee@gmail•com>
The config values set by Scalar went through an audit in the previous
changes, so now reorganize the settings and simplify their purpose.
First, alphabetize the config options, except put the platform-specific
options at the end. This groups two Windows-specific settings and only
one non-Windows setting.
Also, this removes the 'overwrite_on_reconfigure' setting for many of
these options. That setting made nearly all of these options "required"
for scalar enlistments, restricting use for users. Instead, now nearly
all options have removed this setting.
However, there is one setting that still has this, which is
index.skipHash, which was previously being set to _false_ when we
actually prefer the value of true. Keep the overwrite here to help
Scalar users upgrade to the new version. We may remove that overwrite in
the future once we belive that most of the users who have the false
value have upgraded to a version that overwrites that to 'true'.
Signed-off-by: Derrick Stolee <stolee@gmail•com>
---
scalar.c | 60 ++++++++++++++++++++++++++++----------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/scalar.c b/scalar.c
index fb595fab3a..d73f9d85c7 100644
--- a/scalar.c
+++ b/scalar.c
@@ -127,10 +127,33 @@ static int have_fsmonitor_support(void)
static int set_recommended_config(int reconfigure)
{
struct scalar_config config[] = {
- /* Required */
- { "am.keepCR", "true", 1 },
+ { "am.keepCR", "true" },
+ { "commitGraph.changedPaths", "true" },
+ { "commitGraph.generationVersion", "1" },
+ { "core.autoCRLF", "false" },
+ { "core.logAllRefUpdates", "true" },
+ { "core.safeCRLF", "false" },
+ { "credential.https://dev.azure.com.useHttpPath", "true" },
+ { "feature.experimental", "false" },
+ { "feature.manyFiles", "false" },
+ { "fetch.showForcedUpdates", "false" },
+ { "fetch.unpackLimit", "1" },
+ { "fetch.writeCommitGraph", "false" },
+ { "gc.auto", "0" },
+ { "gui.GCWarning", "false" },
+ { "index.skipHash", "true", 1 /* Fix previous setting. */ },
+ { "index.threads", "true"},
+ { "index.version", "4" },
+ { "merge.renames", "true" },
+ { "merge.stat", "false" },
+ { "pack.useBitmaps", "false" },
+ { "pack.usePathWalk", "true" },
+ { "receive.autoGC", "false" },
+ { "status.aheadBehind", "false" },
+
+ /* platform-specific */
#ifndef WIN32
- { "core.untrackedCache", "true", 1 },
+ { "core.untrackedCache", "true" },
#else
/*
* Unfortunately, Scalar's Functional Tests demonstrated
@@ -144,34 +167,11 @@ static int set_recommended_config(int reconfigure)
* Therefore, with a sad heart, we disable this very useful
* feature on Windows.
*/
- { "core.untrackedCache", "false", 1 },
-#endif
- { "core.logAllRefUpdates", "true", 1 },
- { "credential.https://dev.azure.com.useHttpPath", "true", 1 },
- { "gc.auto", "0", 1 },
- { "gui.GCWarning", "false", 1 },
- { "index.skipHash", "true", 1 },
- { "index.threads", "true", 1 },
- { "index.version", "4", 1 },
- { "merge.stat", "false", 1 },
- { "merge.renames", "true", 1 },
- { "pack.useBitmaps", "false", 1 },
- { "receive.autoGC", "false", 1 },
- { "feature.manyFiles", "false", 1 },
- { "feature.experimental", "false", 1 },
- { "fetch.unpackLimit", "1", 1 },
- { "fetch.writeCommitGraph", "false", 1 },
-#ifdef WIN32
- { "http.sslBackend", "schannel", 1 },
+ { "core.untrackedCache", "false" },
+
+ /* Other Windows-specific required settings: */
+ { "http.sslBackend", "schannel" },
#endif
- /* Optional */
- { "status.aheadBehind", "false" },
- { "commitGraph.changedPaths", "true" },
- { "commitGraph.generationVersion", "1" },
- { "core.autoCRLF", "false" },
- { "core.safeCRLF", "false" },
- { "fetch.showForcedUpdates", "false" },
- { "pack.usePathWalk", "true" },
{ NULL, NULL },
};
int i;
--
gitgitgadget
next prev parent reply other threads:[~2025-11-26 22:18 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-26 22:18 [PATCH 0/5] Audit and document Scalar config Derrick Stolee via GitGitGadget
2025-11-26 22:18 ` [PATCH 1/5] scalar: annotate config file with "set by scalar" Derrick Stolee via GitGitGadget
2025-11-26 23:55 ` Junio C Hamano
2025-12-01 8:55 ` Patrick Steinhardt
2025-11-26 22:18 ` [PATCH 2/5] scalar: use index.skipHash=true for performance Derrick Stolee via GitGitGadget
2025-11-26 23:57 ` Junio C Hamano
2025-11-30 19:55 ` Derrick Stolee
2025-11-26 22:18 ` [PATCH 3/5] scalar: remove stale config values Derrick Stolee via GitGitGadget
2025-11-27 0:00 ` Junio C Hamano
2025-11-26 22:18 ` Derrick Stolee via GitGitGadget [this message]
2025-12-01 8:55 ` [PATCH 4/5] scalar: alphabetize and simplify config Patrick Steinhardt
2025-12-01 12:35 ` Derrick Stolee
2025-11-26 22:18 ` [PATCH 5/5] scalar: document config settings Derrick Stolee via GitGitGadget
2025-11-27 0:09 ` Junio C Hamano
2025-11-30 19:56 ` Derrick Stolee
2025-12-01 8:55 ` Patrick Steinhardt
2025-12-01 12:40 ` Derrick Stolee
2025-12-01 14:04 ` [PATCH 0/5] Audit and document Scalar config Johannes Schindelin
2025-12-01 16:50 ` [PATCH v2 " Derrick Stolee via GitGitGadget
2025-12-01 16:50 ` [PATCH v2 1/5] scalar: annotate config file with "set by scalar" Derrick Stolee via GitGitGadget
2025-12-02 7:53 ` Patrick Steinhardt
2025-12-01 16:50 ` [PATCH v2 2/5] scalar: use index.skipHash=true for performance Derrick Stolee via GitGitGadget
2025-12-01 16:50 ` [PATCH v2 3/5] scalar: remove stale config values Derrick Stolee via GitGitGadget
2025-12-01 17:46 ` Matthew Hughes
2025-12-02 7:53 ` Patrick Steinhardt
2025-12-02 19:04 ` Matthew Hughes
2025-12-02 19:22 ` Patrick Steinhardt
2025-12-07 0:34 ` Junio C Hamano
2025-12-08 6:58 ` Patrick Steinhardt
2025-12-12 13:57 ` Derrick Stolee
2025-12-01 16:50 ` [PATCH v2 4/5] scalar: alphabetize and simplify config Derrick Stolee via GitGitGadget
2025-12-01 16:50 ` [PATCH v2 5/5] scalar: document config settings Derrick Stolee via GitGitGadget
2025-12-01 17:58 ` Matthew Hughes
2025-12-02 7:53 ` Patrick Steinhardt
2025-12-11 14:20 ` Henrique Ferreiro
2025-12-12 14:06 ` Derrick Stolee
2025-12-15 12:14 ` Henrique Ferreiro
2025-12-02 2:05 ` [PATCH v2 0/5] Audit and document Scalar config Junio C Hamano
2025-12-12 15:15 ` [PATCH v3 " Derrick Stolee via GitGitGadget
2025-12-12 15:15 ` [PATCH v3 1/5] scalar: annotate config file with "set by scalar" Derrick Stolee via GitGitGadget
2025-12-12 15:15 ` [PATCH v3 2/5] scalar: use index.skipHash=true for performance Derrick Stolee via GitGitGadget
2025-12-12 15:15 ` [PATCH v3 3/5] scalar: remove stale config values Derrick Stolee via GitGitGadget
2025-12-12 15:15 ` [PATCH v3 4/5] scalar: alphabetize and simplify config Derrick Stolee via GitGitGadget
2025-12-12 15:15 ` [PATCH v3 5/5] scalar: document config settings Derrick Stolee via GitGitGadget
2025-12-15 12:33 ` Henrique Ferreiro
2025-12-12 23:49 ` [PATCH v3 0/5] Audit and document Scalar config Junio C Hamano
2025-12-15 14:33 ` Derrick Stolee
2025-12-16 0:39 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9b8ce6ba2bcc802ae38b2e1223d7d93b03fb2a1b.1764195516.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=atthewhughes934@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=ps@pks$(echo .)im \
--cc=stolee@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox