{"thread":{"id":"51228","subject":"[PATCH 00/11] [RFC] Create 'core.size=large' setting to update config defaults","startedAt":"2019-06-03T20:18:22Z","lastAt":"2019-07-22T12:11:03Z","messageCount":48,"participants":["Derrick Stolee via GitGitGadget","Jeff Hostetler via GitGitGadget","Derrick Stolee","Jeff Hostetler","Johannes Schindelin","Junio C Hamano","Carlo Arenas","Duy Nguyen","Ævar Arnfjörð Bjarmason","Jakub Narebski","Taylor Blau"],"isPatch":true,"patchVersion":1,"patchTotal":11},"messages":[{"id":"376599","messageId":"pull.254.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":null,"subject":"[PATCH 00/11] [RFC] Create 'core.size=large' setting to update config defaults","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:18Z","receivedAt":"2019-06-03T20:18:22Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"This patch series includes a few new config options we created to speed up\ncertain critical commands in VFS for Git. On their own, they would\ncontribute little value as it is hard to discover new config variables.\nInstead, I've created this RFC as a goal for probably three sequential patch\nseries:\n\n 1. (Patches 1-3) Introduce a new 'core.size' config setting that takes\n 'large' as a value. This enables several config values that are\n beneficial for large repos. We use a certain set in VFS for Git (see\n [1]), and most of those are applicable to any repo. This 'core.size'\n setting is intended for users to automatically receive performance\n updates as soon as they are stable, but they must opt-in to the setting\n and can always explicitly set their own config values. The settings to\n include here are core.commitGraph=true, gc.writeCommitGraph=true,\n index.version=4, pack.useSparse=true.\n \n \n 2. (Patches 4-8) Introduce 'status.aheadBehind' to dictate if we use\n '--[no-]ahead-behind' during 'git status' calls. Also do some cleanup on\n the feature around porcelain formats. I adapted Jeff Hostetler's commits\n from microsoft/git for this section.\n \n \n 3. (Patches 9-12) Introduce 'fetch.showForcedUpdates' and the associated\n '--[no-]show-forced-updates' option for 'git fetch' and 'git pull'\n calls. When fetching from a remote with many branches that move quickly,\n the check for forced updates can be expensive. Further, the only effects\n are a \"(forced update)\" indicator to stdout and a single bit in the\n reflog. The reflog bit is unfortunate to lose, but it is never trusted\n for important actions. These changes are likely to be more controversial\n than the others.\n \n \n\nHopefully this direction is amenable to allow \"early adopters\" gain access\nto new performance features even if they are not necessary reading every\nline of the release notes.\n\nThanks, -Stolee\n\n[1] \nhttps://github.com/microsoft/VFSForGit/blob/6a7fd2ff50056b73b347b882d2b8d52939bd6419/GVFS/GVFS/CommandLine/GVFSVerb.cs#L122-L152\nThis code includes the settings we enable by default in VFS for Git\nenlistments.\n\nDerrick Stolee (8):\n repo-settings: create repo.size=large setting\n repo-settings: use index.version=4 by default\n repo-settings: pack.useSparse=true\n repo-settings: status.aheadBehind=false\n fetch: add --[no-]show-forced-updates argument\n fetch: warn about forced updates after branch list\n pull: add --[no-]show-forced-updates passthrough to fetch\n repo-settings: fetch.showForcedUpdates=false\n\nJeff Hostetler (3):\n status: add status.aheadbehind setting\n status: add warning when a/b calculation takes too long for\n long/normal format\n status: ignore status.aheadbehind in porcelain formats\n\n Documentation/config/core.txt | 31 ++++++++++++++-\n Documentation/config/fetch.txt | 5 +++\n Documentation/config/gc.txt | 4 +-\n Documentation/config/index.txt | 1 +\n Documentation/config/pack.txt | 3 +-\n Documentation/config/status.txt | 6 +++\n Documentation/fetch-options.txt | 13 +++++++\n Makefile | 1 +\n advice.c | 2 +\n advice.h | 1 +\n builtin/commit.c | 19 ++++++++-\n builtin/fetch.c | 34 ++++++++++++++++-\n builtin/gc.c | 6 +--\n builtin/pack-objects.c | 9 +++--\n builtin/pull.c | 7 ++++\n commit-graph.c | 7 ++--\n read-cache.c | 12 +++---\n repo-settings.c | 68 +++++++++++++++++++++++++++++++++\n repo-settings.h | 17 +++++++++\n repository.h | 3 ++\n t/t6040-tracking-info.sh | 31 +++++++++++++++\n t/t7064-wtstatus-pv2.sh | 8 ++++\n wt-status.c | 17 +++++++++\n 23 files changed, 283 insertions(+), 22 deletions(-)\n create mode 100644 repo-settings.c\n create mode 100644 repo-settings.h\n\n\nbase-commit: aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-254%2Fderrickstolee%2Fconfig-large%2Fupstream-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-254/derrickstolee/config-large/upstream-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/254\n-- \ngitgitgadget\n"},{"id":"376600","messageId":"704613f4480e3b9aacab91d2241247791f34ce22.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 01/11] repo-settings: create repo.size=large setting","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:19Z","receivedAt":"2019-06-03T20:18:23Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"From: Derrick Stolee \n\nSeveral advanced config settings are highly recommended for clients\nusing large repositories. Power users learn these one-by-one and\nenable them as they see fit. This could be made simpler, to allow\nmore users to have access to these almost-always beneficial features\n(and more beneficial in larger repos).\n\nCreate a 'repo.size' config setting whose only accepted value is\n'large'. When a repo.size=large is given, change the default values\nof some config settings. If the setting is given explicitly, then\ntake the explicit value.\n\nThis change adds these two defaults to the repo.size=large setting:\n\n * core.commitGraph=true\n * gc.writeCommitGraph=true\n\nTo centralize these config options and properly set the defaults,\ncreate a repo_settings that contains chars for each config variable.\nUse -1 as \"unset\", with 0 for false and 1 for true.\n\nThe prepare_repo_settings() method ensures that this settings\nstruct has been initialized, and avoids double-scanning the config\nsettings.\n\nSigned-off-by: Derrick Stolee \n---\n Documentation/config/core.txt | 16 +++++++++++--\n Documentation/config/gc.txt | 4 ++--\n Makefile | 1 +\n builtin/gc.c | 6 ++---\n commit-graph.c | 7 +++---\n repo-settings.c | 44 +++++++++++++++++++++++++++++++++++\n repo-settings.h | 13 +++++++++++\n repository.h | 3 +++\n 8 files changed, 84 insertions(+), 10 deletions(-)\n create mode 100644 repo-settings.c\n create mode 100644 repo-settings.h\n\ndiff --git a/Documentation/config/core.txt b/Documentation/config/core.txt\nindex 75538d27e7..1a188db620 100644\n--- a/Documentation/config/core.txt\n+++ b/Documentation/config/core.txt\n@@ -577,8 +577,9 @@ the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1].\n \n core.commitGraph::\n \tIf true, then git will read the commit-graph file (if it exists)\n-\tto parse the graph structure of commits. Defaults to false. See\n-\tlinkgit:git-commit-graph[1] for more information.\n+\tto parse the graph structure of commits. Defaults to false, unless\n+\t`core.size=large`. See linkgit:git-commit-graph[1] for more\n+\tinformation.\n \n core.useReplaceRefs::\n \tIf set to `false`, behave as if the `--no-replace-objects`\n@@ -601,3 +602,14 @@ core.abbrev::\n \tin your repository, which hopefully is enough for\n \tabbreviated object names to stay unique for some time.\n \tThe minimum length is 4.\n+\n+core.size::\n+\tWhen specified as \"large\", change the default values of some config\n+\tvariables to improve performance in a large repository. If a variable\n+\tis specified explicitly, the explicit value will override these\n+\tdefaults:\n++\n+* `core.commitGraph=true` enables reading commit-graph files.\n++\n+* `gc.writeCommitGraph=true` eneables writing commit-graph files during\n+`git gc`.\ndiff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt\nindex 02b92b18b5..680721ebbb 100644\n--- a/Documentation/config/gc.txt\n+++ b/Documentation/config/gc.txt\n@@ -63,8 +63,8 @@ gc.writeCommitGraph::\n \tIf true, then gc will rewrite the commit-graph file when\n \tlinkgit:git-gc[1] is run. When using `git gc --auto`\n \tthe commit-graph will be updated if housekeeping is\n-\trequired. Default is false. See linkgit:git-commit-graph[1]\n-\tfor details.\n+\trequired. Default is false, unless `core.size=large`.\n+\tSee linkgit:git-commit-graph[1] for details.\n \n gc.logExpiry::\n \tIf the file gc.log exists, then `git gc --auto` will print\ndiff --git a/Makefile b/Makefile\nindex 8a7e235352..2d3499d7ac 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -967,6 +967,7 @@ LIB_OBJS += refspec.o\n LIB_OBJS += ref-filter.o\n LIB_OBJS += remote.o\n LIB_OBJS += replace-object.o\n+LIB_OBJS += repo-settings.o\n LIB_OBJS += repository.o\n LIB_OBJS += rerere.o\n LIB_OBJS += resolve-undo.o\ndiff --git a/builtin/gc.c b/builtin/gc.c\nindex 8943bcc300..6281aad961 100644\n--- a/builtin/gc.c\n+++ b/builtin/gc.c\n@@ -27,6 +27,7 @@\n #include \"pack-objects.h\"\n #include \"blob.h\"\n #include \"tree.h\"\n+#include \"repo-settings.h\"\n \n #define FAILED_RUN \"failed to run %s\"\n \n@@ -41,7 +42,6 @@ static int aggressive_depth = 50;\n static int aggressive_window = 250;\n static int gc_auto_threshold = 6700;\n static int gc_auto_pack_limit = 50;\n-static int gc_write_commit_graph;\n static int detach_auto = 1;\n static timestamp_t gc_log_expire_time;\n static const char *gc_log_expire = \"1.day.ago\";\n@@ -148,7 +148,6 @@ static void gc_config(void)\n \tgit_config_get_int(\"gc.aggressivedepth\", &aggressive_depth);\n \tgit_config_get_int(\"gc.auto\", &gc_auto_threshold);\n \tgit_config_get_int(\"gc.autopacklimit\", &gc_auto_pack_limit);\n-\tgit_config_get_bool(\"gc.writecommitgraph\", &gc_write_commit_graph);\n \tgit_config_get_bool(\"gc.autodetach\", &detach_auto);\n \tgit_config_get_expiry(\"gc.pruneexpire\", &prune_expire);\n \tgit_config_get_expiry(\"gc.worktreepruneexpire\", &prune_worktrees_expire);\n@@ -685,7 +684,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)\n \t\tclean_pack_garbage();\n \t}\n \n-\tif (gc_write_commit_graph)\n+\tprepare_repo_settings(the_repository);\n+\tif (the_repository->settings->gc_write_commit_graph == 1)\n \t\twrite_commit_graph_reachable(get_object_directory(), 0,\n \t\t\t\t\t !quiet && !daemonized);\n \ndiff --git a/commit-graph.c b/commit-graph.c\nindex 7c5e54875f..b09c465a7a 100644\n--- a/commit-graph.c\n+++ b/commit-graph.c\n@@ -16,6 +16,7 @@\n #include \"hashmap.h\"\n #include \"replace-object.h\"\n #include \"progress.h\"\n+#include \"repo-settings.h\"\n \n #define GRAPH_SIGNATURE 0x43475048 /* \"CGPH\" */\n #define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* \"OIDF\" */\n@@ -311,7 +312,6 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)\n static int prepare_commit_graph(struct repository *r)\n {\n \tstruct object_directory *odb;\n-\tint config_value;\n \n \tif (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))\n \t\tdie(\"dying as requested by the '%s' variable on commit-graph load!\",\n@@ -321,9 +321,10 @@ static int prepare_commit_graph(struct repository *r)\n \t\treturn !!r->objects->commit_graph;\n \tr->objects->commit_graph_attempted = 1;\n \n+\tprepare_repo_settings(r);\n+\n \tif (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&\n-\t (repo_config_get_bool(r, \"core.commitgraph\", &config_value) ||\n-\t !config_value))\n+\t r->settings->core_commit_graph != 1)\n \t\t/*\n \t\t * This repository is not configured to use commit graphs, so\n \t\t * do not load one. (But report commit_graph_attempted anyway\ndiff --git a/repo-settings.c b/repo-settings.c\nnew file mode 100644\nindex 0000000000..6f5e18d92e\n--- /dev/null\n+++ b/repo-settings.c\n@@ -0,0 +1,44 @@\n+#include \"cache.h\"\n+#include \"repository.h\"\n+#include \"config.h\"\n+#include \"repo-settings.h\"\n+\n+\n+#define UPDATE_DEFAULT(s,v) if (s != -1) { s = v; }\n+\n+static int git_repo_config(const char *key, const char *value, void *cb)\n+{\n+\tstruct repo_settings *rs = (struct repo_settings *)cb;\n+\n+\tif (!strcmp(key, \"core.size\")) {\n+\t\tif (!strcmp(value, \"large\")) {\n+\t\t\tUPDATE_DEFAULT(rs->core_commit_graph, 1);\n+\t\t\tUPDATE_DEFAULT(rs->gc_write_commit_graph, 1);\n+\t\t}\n+\t\treturn 0;\n+\t}\n+\tif (!strcmp(key, \"core.commitgraph\")) {\n+\t\trs->core_commit_graph = git_config_bool(key, value);\n+\t\treturn 0;\n+\t}\n+\tif (!strcmp(key, \"gc.writecommitgraph\")) {\n+\t\trs->gc_write_commit_graph = git_config_bool(key, value);\n+\t\treturn 0;\n+\t}\n+\n+\treturn 1;\n+}\n+\n+void prepare_repo_settings(struct repository *r)\n+{\n+\tif (r->settings)\n+\t\treturn;\n+\n+\tr->settings = xmalloc(sizeof(*r->settings));\n+\n+\t/* Defaults */\n+\tr->settings->core_commit_graph = -1;\n+\tr->settings->gc_write_commit_graph = -1;\n+\n+\trepo_config(r, git_repo_config, r->settings);\n+}\ndiff --git a/repo-settings.h b/repo-settings.h\nnew file mode 100644\nindex 0000000000..11d08648e1\n--- /dev/null\n+++ b/repo-settings.h\n@@ -0,0 +1,13 @@\n+#ifndef REPO_SETTINGS_H\n+#define REPO_SETTINGS_H\n+\n+struct repo_settings {\n+\tchar core_commit_graph;\n+\tchar gc_write_commit_graph;\n+};\n+\n+struct repository;\n+\n+void prepare_repo_settings(struct repository *r);\n+\n+#endif /* REPO_SETTINGS_H */\ndiff --git a/repository.h b/repository.h\nindex 4fb6a5885f..352afc9cd8 100644\n--- a/repository.h\n+++ b/repository.h\n@@ -4,6 +4,7 @@\n #include \"path.h\"\n \n struct config_set;\n+struct repo_settings;\n struct git_hash_algo;\n struct index_state;\n struct lock_file;\n@@ -72,6 +73,8 @@ struct repository {\n \t */\n \tchar *submodule_prefix;\n \n+\tstruct repo_settings *settings;\n+\n \t/* Subsystems */\n \t/*\n \t * Repository's config which contains key-value pairs from the usual\n-- \ngitgitgadget\n\n"},{"id":"376601","messageId":"d5f5d7453c8135cf0c1186447de4323d31d4eca8.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 02/11] repo-settings: use index.version=4 by default","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:20Z","receivedAt":"2019-06-03T20:18:27Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"From: Derrick Stolee \n\nIf a repo is large, it likely has many paths in its working directory.\nThis means the index could be compressed using version 4. Set this as\na default when core.size=large.\n\nSigned-off-by: Derrick Stolee \n---\n Documentation/config/core.txt | 3 +++\n Documentation/config/index.txt | 1 +\n read-cache.c | 12 +++++++-----\n repo-settings.c | 6 ++++++\n repo-settings.h | 1 +\n 5 files changed, 18 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/config/core.txt b/Documentation/config/core.txt\nindex 1a188db620..ea64f675fa 100644\n--- a/Documentation/config/core.txt\n+++ b/Documentation/config/core.txt\n@@ -613,3 +613,6 @@ core.size::\n +\n * `gc.writeCommitGraph=true` eneables writing commit-graph files during\n `git gc`.\n++\n+* `index.version=4` uses prefix-compression to reduce the size of the\n+.git/index file.\ndiff --git a/Documentation/config/index.txt b/Documentation/config/index.txt\nindex f181503041..d4b56925c4 100644\n--- a/Documentation/config/index.txt\n+++ b/Documentation/config/index.txt\n@@ -24,3 +24,4 @@ index.threads::\n index.version::\n \tSpecify the version with which new index files should be\n \tinitialized. This does not affect existing repositories.\n+\tIf `core.size=large`, then the default value is 4.\ndiff --git a/read-cache.c b/read-cache.c\nindex 22e7b9944e..7fab8ff748 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -25,6 +25,7 @@\n #include \"fsmonitor.h\"\n #include \"thread-utils.h\"\n #include \"progress.h\"\n+#include \"repo-settings.h\"\n \n /* Mask for the name length in ce_flags in the on-disk index */\n \n@@ -1599,16 +1600,17 @@ struct cache_entry *refresh_cache_entry(struct index_state *istate,\n \n #define INDEX_FORMAT_DEFAULT 3\n \n-static unsigned int get_index_format_default(void)\n+static unsigned int get_index_format_default(struct repository *r)\n {\n \tchar *envversion = getenv(\"GIT_INDEX_VERSION\");\n \tchar *endp;\n-\tint value;\n \tunsigned int version = INDEX_FORMAT_DEFAULT;\n \n \tif (!envversion) {\n-\t\tif (!git_config_get_int(\"index.version\", &value))\n-\t\t\tversion = value;\n+\t\tprepare_repo_settings(r);\n+\n+\t\tif (r->settings->index_version >= 0)\n+\t\t\tversion = r->settings->index_version;\n \t\tif (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {\n \t\t\twarning(_(\"index.version set, but the value is invalid.\\n\"\n \t\t\t\t \"Using version %i\"), INDEX_FORMAT_DEFAULT);\n@@ -2765,7 +2767,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,\n \t}\n \n \tif (!istate->version) {\n-\t\tistate->version = get_index_format_default();\n+\t\tistate->version = get_index_format_default(the_repository);\n \t\tif (git_env_bool(\"GIT_TEST_SPLIT_INDEX\", 0))\n \t\t\tinit_split_index(istate);\n \t}\ndiff --git a/repo-settings.c b/repo-settings.c\nindex 6f5e18d92e..7e6e65d60c 100644\n--- a/repo-settings.c\n+++ b/repo-settings.c\n@@ -14,6 +14,7 @@ static int git_repo_config(const char *key, const char *value, void *cb)\n \t\tif (!strcmp(value, \"large\")) {\n \t\t\tUPDATE_DEFAULT(rs->core_commit_graph, 1);\n \t\t\tUPDATE_DEFAULT(rs->gc_write_commit_graph, 1);\n+\t\t\tUPDATE_DEFAULT(rs->index_version, 4);\n \t\t}\n \t\treturn 0;\n \t}\n@@ -25,6 +26,10 @@ static int git_repo_config(const char *key, const char *value, void *cb)\n \t\trs->gc_write_commit_graph = git_config_bool(key, value);\n \t\treturn 0;\n \t}\n+\tif (!strcmp(key, \"index.version\")) {\n+\t\trs->index_version = git_config_int(key, value);\n+\t\treturn 0;\n+\t}\n \n \treturn 1;\n }\n@@ -39,6 +44,7 @@ void prepare_repo_settings(struct repository *r)\n \t/* Defaults */\n \tr->settings->core_commit_graph = -1;\n \tr->settings->gc_write_commit_graph = -1;\n+\tr->settings->index_version = -1;\n \n \trepo_config(r, git_repo_config, r->settings);\n }\ndiff --git a/repo-settings.h b/repo-settings.h\nindex 11d08648e1..9b8104042e 100644\n--- a/repo-settings.h\n+++ b/repo-settings.h\n@@ -4,6 +4,7 @@\n struct repo_settings {\n \tchar core_commit_graph;\n \tchar gc_write_commit_graph;\n+\tint index_version;\n };\n \n struct repository;\n-- \ngitgitgadget\n\n"},{"id":"376602","messageId":"d2e5cf185711385643999493fcfbcf03afe13e34.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 05/11] status: add warning when a/b calculation takes too long for long/normal format","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:22Z","receivedAt":"2019-06-03T20:18:27Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Derrick Stolee \n---\n advice.c | 2 ++\n advice.h | 1 +\n wt-status.c | 17 +++++++++++++++++\n 3 files changed, 20 insertions(+)\n\ndiff --git a/advice.c b/advice.c\nindex ce5f374ecd..54f8dea30c 100644\n--- a/advice.c\n+++ b/advice.c\n@@ -12,6 +12,7 @@ int advice_push_needs_force = 1;\n int advice_push_unqualified_ref_name = 1;\n int advice_status_hints = 1;\n int advice_status_u_option = 1;\n+int advice_status_ahead_behind_warning = 1;\n int advice_commit_before_merge = 1;\n int advice_reset_quiet_warning = 1;\n int advice_resolve_conflict = 1;\n@@ -68,6 +69,7 @@ static struct {\n \t{ \"pushUnqualifiedRefName\", &advice_push_unqualified_ref_name },\n \t{ \"statusHints\", &advice_status_hints },\n \t{ \"statusUoption\", &advice_status_u_option },\n+\t{ \"statusAheadBehindWarning\", &advice_status_ahead_behind_warning },\n \t{ \"commitBeforeMerge\", &advice_commit_before_merge },\n \t{ \"resetQuiet\", &advice_reset_quiet_warning },\n \t{ \"resolveConflict\", &advice_resolve_conflict },\ndiff --git a/advice.h b/advice.h\nindex e50f02cdfe..c86de9b9b8 100644\n--- a/advice.h\n+++ b/advice.h\n@@ -12,6 +12,7 @@ extern int advice_push_needs_force;\n extern int advice_push_unqualified_ref_name;\n extern int advice_status_hints;\n extern int advice_status_u_option;\n+extern int advice_status_ahead_behind_warning;\n extern int advice_commit_before_merge;\n extern int advice_reset_quiet_warning;\n extern int advice_resolve_conflict;\ndiff --git a/wt-status.c b/wt-status.c\nindex d2a1bec226..c94d43879a 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -19,6 +19,8 @@\n #include \"lockfile.h\"\n #include \"sequencer.h\"\n \n+#define AB_DELAY_WARNING_IN_MS (2 * 1000)\n+\n static const char cut_line[] =\n \"------------------------ >8 ------------------------\\n\";\n \n@@ -1085,14 +1087,29 @@ static void wt_longstatus_print_tracking(struct wt_status *s)\n \tstruct branch *branch;\n \tchar comment_line_string[3];\n \tint i;\n+\tuint64_t t_begin = 0;\n \n \tassert(s->branch && !s->is_initial);\n \tif (!skip_prefix(s->branch, \"refs/heads/\", &branch_name))\n \t\treturn;\n \tbranch = branch_get(branch_name);\n+\n+\tt_begin = getnanotime();\n+\n \tif (!format_tracking_info(branch, &sb, s->ahead_behind_flags))\n \t\treturn;\n \n+\tif (advice_status_ahead_behind_warning &&\n+\t s->ahead_behind_flags == AHEAD_BEHIND_FULL) {\n+\t\tuint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;\n+\t\tif (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {\n+\t\t\tstrbuf_addf(&sb, _(\"\\n\"\n+\t\t\t\t\t \"It took %.2f seconds to compute the branch ahead/behind values.\\n\"\n+\t\t\t\t\t \"You can use '--no-ahead-behind' to avoid this.\\n\"),\n+\t\t\t\t t_delta_in_ms / 1000.0);\n+\t\t}\n+\t}\n+\n \ti = 0;\n \tif (s->display_comment_prefix) {\n \t\tcomment_line_string[i++] = comment_line_char;\n-- \ngitgitgadget\n\n"},{"id":"376603","messageId":"6a80cfa5a5604eb4560e8ad7254a982caa894678.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 09/11] fetch: warn about forced updates after branch list","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:25Z","receivedAt":"2019-06-03T20:18:29Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"From: Derrick Stolee \n\nSigned-off-by: Derrick Stolee \n---\n builtin/fetch.c | 25 ++++++++++++++++++++++++-\n 1 file changed, 24 insertions(+), 1 deletion(-)\n\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 571c255218..f8ff98fdaf 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -24,6 +24,8 @@\n #include \"list-objects-filter-options.h\"\n #include \"commit-reach.h\"\n \n+#define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)\n+\n static const char * const builtin_fetch_usage[] = {\n \tN_(\"git fetch [] [ [...]]\"),\n \tN_(\"git fetch [] \"),\n@@ -40,6 +42,7 @@ enum {\n \n static int fetch_prune_config = -1; /* unspecified */\n static int fetch_show_forced_updates = 1;\n+static uint64_t forced_updates_ms = 0;\n static int prune = -1; /* unspecified */\n #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */\n \n@@ -707,6 +710,7 @@ static int update_local_ref(struct ref *ref,\n \tenum object_type type;\n \tstruct branch *current_branch = branch_get(NULL);\n \tconst char *pretty_ref = prettify_refname(ref->name);\n+\tint fast_forward = 0;\n \n \ttype = oid_object_info(the_repository, &ref->new_oid, NULL);\n \tif (type < 0)\n@@ -781,7 +785,15 @@ static int update_local_ref(struct ref *ref,\n \t\treturn r;\n \t}\n \n-\tif (!fetch_show_forced_updates || in_merge_bases(current, updated)) {\n+\tif (fetch_show_forced_updates) {\n+\t\tuint64_t t_before = getnanotime();\n+\t\tfast_forward = in_merge_bases(current, updated);\n+\t\tforced_updates_ms += (getnanotime() - t_before) / 1000000;\n+\t} else {\n+\t\tfast_forward = 1;\n+\t}\n+\n+\tif (fast_forward) {\n \t\tstruct strbuf quickref = STRBUF_INIT;\n \t\tint r;\n \n@@ -980,6 +992,17 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,\n \t\t \" 'git remote prune %s' to remove any old, conflicting \"\n \t\t \"branches\"), remote_name);\n \n+\tif (!fetch_show_forced_updates) {\n+\t\twarning(_(\"Fetch normally indicates which branches had a forced update, but that check has been disabled.\"));\n+\t\twarning(_(\"To re-enable, use '--show-forced-updates' flag or run 'git config fetch.showForcedUpdates true'.\"));\n+\t}\n+\tif (fetch_show_forced_updates &&\n+\t forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {\n+\t\twarning(_(\"It took %.2f seconds to check forced updates. You can use '--no-show-forced-updates'\\n\"),\n+\t\t\tforced_updates_ms / 1000.0);\n+\t\twarning(_(\"or run 'git config fetch.showForcedUpdates false' to avoid this check.\\n\"));\n+\t}\n+\n abort:\n \tstrbuf_release(¬e);\n \tfree(url);\n-- \ngitgitgadget\n\n"},{"id":"376604","messageId":"936fae31b712f5cce52258619b07d35356903bc6.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 07/11] repo-settings: status.aheadBehind=false","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:23Z","receivedAt":"2019-06-03T20:18:30Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"From: Derrick Stolee \n\nWhen a repo has many active developers, the commit history can grow\nvery quickly. This can lead remote branches from being very far from\ntheir local copies.\n\nSet stats.aheadBehind=false by default when core.size=large, so all\n'git status' calls have an implied '--no-ahead-behind' argument.\n\nSigned-off-by: Derrick Stolee \n---\n Documentation/config/core.txt | 3 +++\n Documentation/config/status.txt | 3 ++-\n builtin/commit.c | 12 ++++++------\n repo-settings.c | 6 ++++++\n repo-settings.h | 1 +\n 5 files changed, 18 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/config/core.txt b/Documentation/config/core.txt\nindex df357f5af5..6bed956a08 100644\n--- a/Documentation/config/core.txt\n+++ b/Documentation/config/core.txt\n@@ -620,3 +620,6 @@ core.size::\n * `pack.useSparse=true` uses the sparse tree-walk algorithm, which is\n optimized for enumerating objects during linkgit:git-push[1] from a\n client machine.\n++\n+* `status.aheadBehind=false` enables `--no-ahead-behind` by default during\n+linkgit:git-status[1] calls, saving time in a fast-moving commit history.\ndiff --git a/Documentation/config/status.txt b/Documentation/config/status.txt\nindex 0fc704ab80..3e39019810 100644\n--- a/Documentation/config/status.txt\n+++ b/Documentation/config/status.txt\n@@ -15,7 +15,8 @@ status.branch::\n status.aheadBehind::\n \tSet to true to enable `--ahead-behind` and false to enable\n \t`--no-ahead-behind` by default in linkgit:git-status[1] for\n-\tnon-porcelain status formats. Defaults to true.\n+\tnon-porcelain status formats. Defaults to true, unless\n+\t`core.size=large`.\n \n status.displayCommentPrefix::\n \tIf set to true, linkgit:git-status[1] will insert a comment\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 79cb238d87..246a802167 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -36,6 +36,7 @@\n #include \"help.h\"\n #include \"commit-reach.h\"\n #include \"commit-graph.h\"\n+#include \"repo-settings.h\"\n \n static const char * const builtin_commit_usage[] = {\n \tN_(\"git commit [] [--] ...\"),\n@@ -1117,8 +1118,11 @@ static void finalize_deferred_config(struct wt_status *s)\n \t * in particular), we inherit _FULL for backwards compatibility.\n \t */\n \tif (use_deferred_config &&\n-\t s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)\n-\t\ts->ahead_behind_flags = status_deferred_config.ahead_behind;\n+\t s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED) {\n+\t\tprepare_repo_settings(the_repository);\n+\t\tif (the_repository->settings->status_ahead_behind != -1)\n+\t\t\ts->ahead_behind_flags = the_repository->settings->status_ahead_behind;\n+\t}\n \n \tif (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)\n \t\ts->ahead_behind_flags = AHEAD_BEHIND_FULL;\n@@ -1259,10 +1263,6 @@ static int git_status_config(const char *k, const char *v, void *cb)\n \t\tstatus_deferred_config.show_branch = git_config_bool(k, v);\n \t\treturn 0;\n \t}\n-\tif (!strcmp(k, \"status.aheadbehind\")) {\n-\t\tstatus_deferred_config.ahead_behind = git_config_bool(k, v);\n-\t\treturn 0;\n-\t}\n \tif (!strcmp(k, \"status.showstash\")) {\n \t\ts->show_stash = git_config_bool(k, v);\n \t\treturn 0;\ndiff --git a/repo-settings.c b/repo-settings.c\nindex 026ab9c1a0..b3d4b50b72 100644\n--- a/repo-settings.c\n+++ b/repo-settings.c\n@@ -15,6 +15,7 @@ static int git_repo_config(const char *key, const char *value, void *cb)\n \t\t\tUPDATE_DEFAULT(rs->core_commit_graph, 1);\n \t\t\tUPDATE_DEFAULT(rs->gc_write_commit_graph, 1);\n \t\t\tUPDATE_DEFAULT(rs->pack_use_sparse, 1);\n+\t\t\tUPDATE_DEFAULT(rs->status_ahead_behind, 1);\n \t\t\tUPDATE_DEFAULT(rs->index_version, 4);\n \t\t}\n \t\treturn 0;\n@@ -31,6 +32,10 @@ static int git_repo_config(const char *key, const char *value, void *cb)\n \t\trs->pack_use_sparse = git_config_bool(key, value);\n \t\treturn 0;\n \t}\n+\tif (!strcmp(key, \"status.aheadbehind\")) {\n+\t\trs->status_ahead_behind = git_config_bool(key, value);\n+\t\treturn 0;\n+\t}\n \tif (!strcmp(key, \"index.version\")) {\n \t\trs->index_version = git_config_int(key, value);\n \t\treturn 0;\n@@ -50,6 +55,7 @@ void prepare_repo_settings(struct repository *r)\n \tr->settings->core_commit_graph = -1;\n \tr->settings->gc_write_commit_graph = -1;\n \tr->settings->pack_use_sparse = -1;\n+\tr->settings->status_ahead_behind = -1;\n \tr->settings->index_version = -1;\n \n \trepo_config(r, git_repo_config, r->settings);\ndiff --git a/repo-settings.h b/repo-settings.h\nindex b50228f992..cc358a083a 100644\n--- a/repo-settings.h\n+++ b/repo-settings.h\n@@ -5,6 +5,7 @@ struct repo_settings {\n \tchar core_commit_graph;\n \tchar gc_write_commit_graph;\n \tchar pack_use_sparse;\n+\tchar status_ahead_behind;\n \tint index_version;\n };\n \n-- \ngitgitgadget\n\n"},{"id":"376605","messageId":"d4ff987ad950325ccae7b32571c4a66d5eecc851.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 11/11] repo-settings: fetch.showForcedUpdates=false","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:26Z","receivedAt":"2019-06-03T20:18:31Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"From: Derrick Stolee \n\nWhen a repo has many active contributors, the commit history can\ngrow very quickly and there can be many branches. During 'git fetch',\nafter downloading the pack from the remote, the default behavior\nchecks each remote ref for a forced update. This presents a\nsomewhat quadratic performance hit, as the time it takes to walk these\ncommits can be on the order of the number of branches times the\n\"commit velocity\" per branch.\n\nSet fetch.showForcedUpdates=false when core.size=large to enable\nthe --no-show-forced-updates option by default for fetch and pull\ncommands.\n\nSigned-off-by: Derrick Stolee \n---\n Documentation/config/core.txt | 5 +++++\n Documentation/config/fetch.txt | 2 +-\n builtin/fetch.c | 10 +++++-----\n repo-settings.c | 6 ++++++\n repo-settings.h | 1 +\n 5 files changed, 18 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/config/core.txt b/Documentation/config/core.txt\nindex 6bed956a08..5733128d48 100644\n--- a/Documentation/config/core.txt\n+++ b/Documentation/config/core.txt\n@@ -623,3 +623,8 @@ client machine.\n +\n * `status.aheadBehind=false` enables `--no-ahead-behind` by default during\n linkgit:git-status[1] calls, saving time in a fast-moving commit history.\n++\n+* `fetch.showForcedUpdates=false` enables `--no-show-forced-updates` by\n+default during linkgit:git-fetch[1] and linkgit:git-pull[1] calls, saving\n+time in a fast-moving commit history. This has a small side-effect of not\n+updating the forced-update bit in the reflog.\ndiff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt\nindex ba890b5884..b7a3b08854 100644\n--- a/Documentation/config/fetch.txt\n+++ b/Documentation/config/fetch.txt\n@@ -67,4 +67,4 @@ See also the `--negotiation-tip` option for linkgit:git-fetch[1].\n fetch.showForcedUpdates::\n \tSet to false to enable `--no-show-forced-updates` in\n \tlinkgit:git-fetch[1] and linkgit:git-pull[1] commands.\n-\tDefaults to true.\n+\tDefaults to true, unless `core.size=large`.\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex f8ff98fdaf..56683ece17 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -23,6 +23,7 @@\n #include \"packfile.h\"\n #include \"list-objects-filter-options.h\"\n #include \"commit-reach.h\"\n+#include \"repo-settings.h\"\n \n #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)\n \n@@ -83,11 +84,6 @@ static int git_fetch_config(const char *k, const char *v, void *cb)\n \t\treturn 0;\n \t}\n \n-\tif (!strcmp(k, \"fetch.showforcedupdates\")) {\n-\t\tfetch_show_forced_updates = git_config_bool(k, v);\n-\t\treturn 0;\n-\t}\n-\n \tif (!strcmp(k, \"submodule.recurse\")) {\n \t\tint r = git_config_bool(k, v) ?\n \t\t\tRECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;\n@@ -1618,6 +1614,10 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)\n \tfetch_config_from_gitmodules(&max_children, &recurse_submodules);\n \tgit_config(git_fetch_config, NULL);\n \n+\tprepare_repo_settings(the_repository);\n+\tif (the_repository->settings->fetch_show_forced_updates != -1)\n+\t\tfetch_show_forced_updates = the_repository->settings->fetch_show_forced_updates;\n+\n \targc = parse_options(argc, argv, prefix,\n \t\t\t builtin_fetch_options, builtin_fetch_usage, 0);\n \ndiff --git a/repo-settings.c b/repo-settings.c\nindex b3d4b50b72..84e87913a5 100644\n--- a/repo-settings.c\n+++ b/repo-settings.c\n@@ -16,6 +16,7 @@ static int git_repo_config(const char *key, const char *value, void *cb)\n \t\t\tUPDATE_DEFAULT(rs->gc_write_commit_graph, 1);\n \t\t\tUPDATE_DEFAULT(rs->pack_use_sparse, 1);\n \t\t\tUPDATE_DEFAULT(rs->status_ahead_behind, 1);\n+\t\t\tUPDATE_DEFAULT(rs->fetch_show_forced_updates, 1);\n \t\t\tUPDATE_DEFAULT(rs->index_version, 4);\n \t\t}\n \t\treturn 0;\n@@ -36,6 +37,10 @@ static int git_repo_config(const char *key, const char *value, void *cb)\n \t\trs->status_ahead_behind = git_config_bool(key, value);\n \t\treturn 0;\n \t}\n+\tif (!strcmp(key, \"fetch.showforcedupdates\")) {\n+\t\trs->fetch_show_forced_updates = git_config_bool(key, value);\n+\t\treturn 0;\n+\t}\n \tif (!strcmp(key, \"index.version\")) {\n \t\trs->index_version = git_config_int(key, value);\n \t\treturn 0;\n@@ -56,6 +61,7 @@ void prepare_repo_settings(struct repository *r)\n \tr->settings->gc_write_commit_graph = -1;\n \tr->settings->pack_use_sparse = -1;\n \tr->settings->status_ahead_behind = -1;\n+\tr->settings->fetch_show_forced_updates = -1;\n \tr->settings->index_version = -1;\n \n \trepo_config(r, git_repo_config, r->settings);\ndiff --git a/repo-settings.h b/repo-settings.h\nindex cc358a083a..ea7d27138f 100644\n--- a/repo-settings.h\n+++ b/repo-settings.h\n@@ -6,6 +6,7 @@ struct repo_settings {\n \tchar gc_write_commit_graph;\n \tchar pack_use_sparse;\n \tchar status_ahead_behind;\n+\tchar fetch_show_forced_updates;\n \tint index_version;\n };\n \n-- \ngitgitgadget\n"},{"id":"376606","messageId":"637aebc8ac1b90a3c7eed859c5d2c054f637a4b6.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 10/11] pull: add --[no-]show-forced-updates passthrough to fetch","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:25Z","receivedAt":"2019-06-03T20:18:32Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"From: Derrick Stolee \n\nSigned-off-by: Derrick Stolee \n---\n builtin/pull.c | 7 +++++++\n 1 file changed, 7 insertions(+)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex 9dd32a115b..f1eaf6e6ed 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -128,6 +128,7 @@ static char *opt_update_shallow;\n static char *opt_refmap;\n static char *opt_ipv4;\n static char *opt_ipv6;\n+static int opt_show_forced_updates = -1;\n \n static struct option pull_options[] = {\n \t/* Shared options */\n@@ -240,6 +241,8 @@ static struct option pull_options[] = {\n \tOPT_PASSTHRU('6', \"ipv6\", &opt_ipv6, NULL,\n \t\tN_(\"use IPv6 addresses only\"),\n \t\tPARSE_OPT_NOARG),\n+\tOPT_BOOL(0, \"show-forced-updates\", &opt_show_forced_updates,\n+\t\t N_(\"check for forced-updates on all updated branches\")),\n \n \tOPT_END()\n };\n@@ -549,6 +552,10 @@ static int run_fetch(const char *repo, const char **refspecs)\n \t\targv_array_push(&args, opt_ipv4);\n \tif (opt_ipv6)\n \t\targv_array_push(&args, opt_ipv6);\n+\tif (opt_show_forced_updates > 0)\n+\t\targv_array_push(&args, \"--show-forced-updates\");\n+\telse if (opt_show_forced_updates == 0)\n+\t\targv_array_push(&args, \"--no-show-forced-updates\");\n \n \tif (repo) {\n \t\targv_array_push(&args, repo);\n-- \ngitgitgadget\n\n"},{"id":"376607","messageId":"2d6bf8513d928765d7411a28c526d9c77237b3fe.1559593097.git.gitgitgadget@gmail.com","threadId":"51228","inReplyTo":"pull.254.git.gitgitgadget@gmail.com","subject":"[PATCH 08/11] fetch: add --[no-]show-forced-updates argument","fromName":"Derrick Stolee via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-03T20:18:24Z","receivedAt":"2019-06-03T20:18:34Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"From: Derrick Stolee \n\nAfter updating a set of remove refs during a 'git fetch', we walk the\ncommits in the new ref value and not in the old ref value to discover\nif the update was a forced update. This results in two things happening\nduring the command:\n\n 1. The line including the ref update has an additional \"(forced-update)\"\n marker at the end.\n\n 2. The ref log for that remote branch includes a bit saying that update\n is a forced update.\n\nFor many situations, this forced-update message happens infrequently, or\nis a small bit of information among many ref updates. Many users ignore\nthese messages, but the calculation required here slows down their fetches\nsignificantly. Keep in mind that they do not have the opportunity to\ncalculate a commit-graph file containing the newly-fetched commits, so\nthese comparisons can be very slow.\n\nAdd a '--[no-]show-forced-updates' option that allows a user to skip this\ncalculation. The only permanent result is dropping the forced-update bit\nin the reflog.\n\nInclude a new fetch.showForcedUpdates config setting that allows this\nbehavior without including the argument in every command. The config\nsetting is overridden by the command-line arguments.\n\nSigned-off-by: Derrick Stolee \n---\n Documentation/config/fetch.txt | 5 +++++\n Documentation/fetch-options.txt | 13 +++++++++++++\n builtin/fetch.c | 11 ++++++++++-\n 3 files changed, 28 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt\nindex cbfad6cdbb..ba890b5884 100644\n--- a/Documentation/config/fetch.txt\n+++ b/Documentation/config/fetch.txt\n@@ -63,3 +63,8 @@ fetch.negotiationAlgorithm::\n \tUnknown values will cause 'git fetch' to error out.\n +\n See also the `--negotiation-tip` option for linkgit:git-fetch[1].\n+\n+fetch.showForcedUpdates::\n+\tSet to false to enable `--no-show-forced-updates` in\n+\tlinkgit:git-fetch[1] and linkgit:git-pull[1] commands.\n+\tDefaults to true.\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 91c47752ec..5801d23ae4 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -221,6 +221,19 @@ endif::git-pull[]\n \tWhen multiple `--server-option=