[PATCH 07/11] repo-settings: status.aheadBehind=false
- From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Jun 3, 2019, 20:18 UTC
- Message-ID
- <936fae31b712f5cce52258619b07d35356903bc6.1559593097.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.254.git.gitgitgadget@gmail.com>
From: Derrick Stolee <dstolee@microsoft.com>
When a repo has many active developers, the commit history can grow very quickly. This can lead remote branches from being very far from their local copies.
Set stats.aheadBehind=false by default when core.size=large, so all 'git status' calls have an implied '--no-ahead-behind' argument.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com> --- Documentation/config/core.txt | 3 +++ Documentation/config/status.txt | 3 ++- builtin/commit.c | 12 ++++++------ repo-settings.c | 6 ++++++ repo-settings.h | 1 + 5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt index df357f5af5..6bed956a08 100644 --- a/Documentation/config/core.txt +++ b/Documentation/config/core.txt @@ -620,3 +620,6 @@ core.size:: * `pack.useSparse=true` uses the sparse tree-walk algorithm, which is optimized for enumerating objects during linkgit:git-push[1] from a client machine. ++ +* `status.aheadBehind=false` enables `--no-ahead-behind` by default during +linkgit:git-status[1] calls, saving time in a fast-moving commit history. diff --git a/Documentation/config/status.txt b/Documentation/config/status.txt index 0fc704ab80..3e39019810 100644 --- a/Documentation/config/status.txt +++ b/Documentation/config/status.txt @@ -15,7 +15,8 @@ status.branch:: status.aheadBehind:: Set to true to enable `--ahead-behind` and false to enable `--no-ahead-behind` by default in linkgit:git-status[1] for - non-porcelain status formats. Defaults to true. + non-porcelain status formats. Defaults to true, unless + `core.size=large`. status.displayCommentPrefix:: If set to true, linkgit:git-status[1] will insert a comment diff --git a/builtin/commit.c b/builtin/commit.c index 79cb238d87..246a802167 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -36,6 +36,7 @@ #include "help.h" #include "commit-reach.h" #include "commit-graph.h" +#include "repo-settings.h" static const char * const builtin_commit_usage[] = { N_("git commit [<options>] [--] <pathspec>..."), @@ -1117,8 +1118,11 @@ static void finalize_deferred_config(struct wt_status *s) * in particular), we inherit _FULL for backwards compatibility. */ if (use_deferred_config && - s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED) - s->ahead_behind_flags = status_deferred_config.ahead_behind; + s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED) { + prepare_repo_settings(the_repository); + if (the_repository->settings->status_ahead_behind != -1) + s->ahead_behind_flags = the_repository->settings->status_ahead_behind; + } if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED) s->ahead_behind_flags = AHEAD_BEHIND_FULL; @@ -1259,10 +1263,6 @@ static int git_status_config(const char *k, const char *v, void *cb) status_deferred_config.show_branch = git_config_bool(k, v); return 0; } - if (!strcmp(k, "status.aheadbehind")) { - status_deferred_config.ahead_behind = git_config_bool(k, v); - return 0; - } if (!strcmp(k, "status.showstash")) { s->show_stash = git_config_bool(k, v); return 0; diff --git a/repo-settings.c b/repo-settings.c index 026ab9c1a0..b3d4b50b72 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -15,6 +15,7 @@ static int git_repo_config(const char *key, const char *value, void *cb) UPDATE_DEFAULT(rs->core_commit_graph, 1); UPDATE_DEFAULT(rs->gc_write_commit_graph, 1); UPDATE_DEFAULT(rs->pack_use_sparse, 1); + UPDATE_DEFAULT(rs->status_ahead_behind, 1); UPDATE_DEFAULT(rs->index_version, 4); } return 0; @@ -31,6 +32,10 @@ static int git_repo_config(const char *key, const char *value, void *cb) rs->pack_use_sparse = git_config_bool(key, value); return 0; } + if (!strcmp(key, "status.aheadbehind")) { + rs->status_ahead_behind = git_config_bool(key, value); + return 0; + } if (!strcmp(key, "index.version")) { rs->index_version = git_config_int(key, value); return 0; @@ -50,6 +55,7 @@ void prepare_repo_settings(struct repository *r) r->settings->core_commit_graph = -1; r->settings->gc_write_commit_graph = -1; r->settings->pack_use_sparse = -1; + r->settings->status_ahead_behind = -1; r->settings->index_version = -1; repo_config(r, git_repo_config, r->settings); diff --git a/repo-settings.h b/repo-settings.h index b50228f992..cc358a083a 100644 --- a/repo-settings.h +++ b/repo-settings.h @@ -5,6 +5,7 @@ struct repo_settings { char core_commit_graph; char gc_write_commit_graph; char pack_use_sparse; + char status_ahead_behind; int index_version; };
-- gitgitgadget