Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/git/git-scm.com.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2022-10-27 22:51:08 +0300
committerGitHub <noreply@github.com>2022-10-27 22:51:08 +0300
commit9534d1f39e9f68762ddfefc5a3b087e24864ff65 (patch)
tree136596831bdb28e11c0d39700ca54903c68c8e07
parentf2b5cdfb8e806a2bd7bdf809b32efa6f28e1a954 (diff)
parent51c8e488333c84700926640d024b44c78ed7ad9d (diff)
Merge pull request #1747 from vdye/bugfix/scalar-docs
Fix building of Scalar docs & include a temporary workaround for overlapping names
-rw-r--r--lib/tasks/index.rake6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/tasks/index.rake b/lib/tasks/index.rake
index e669e033..3ee615a9 100644
--- a/lib/tasks/index.rake
+++ b/lib/tasks/index.rake
@@ -56,7 +56,8 @@ def index_l10n_doc(filter_tags, doc_list, get_content)
ent.first =~
/^([-_\w]+)\/(
(
- git.*
+ git.* |
+ scalar
)\.txt)/x
end
@@ -198,6 +199,7 @@ def index_doc(filter_tags, doc_list, get_content)
rev.* |
pretty.* |
pull.* |
+ scalar |
technical\/.*
)\.txt)/x
end
@@ -260,6 +262,8 @@ def index_doc(filter_tags, doc_list, get_content)
path, sha = entry
ids = Set.new([])
docname = File.basename(path, ".txt")
+ # TEMPORARY: skip the scalar technical doc until it has a non-overlapping name
+ next if path == "Documentation/technical/scalar.txt"
next if doc_limit && path !~ /#{doc_limit}/
file = DocFile.where(name: docname).first_or_create