mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-04-23 10:51:14 -03:00
081c469f6f
The problem worked around by commit e4674cd7b5 (.cargo/config.toml:
exclude from tarball, 2025-01-12) is as follows:
our OBS packages are built by doing something like
tar xf $tarball && tar xf $vendor_tarball
except that the tool apparently break when a file is present in
both tarballs.
Our workaround is to not include .cargo/config.toml in the tarball.
The workaround seems too broad. It need not affect all tarballs
but only the ones used by OBS. We want to add xtask aliases to
.cargo/config.toml. They will be used by CMake targets (sphinx-doc),
so they should be available to tarball consumers.
Restrict the scope of the workaround: add back .cargo/config.toml
to the export, and allow opting in to this behavioer by passing a
negative pathspec
build_tools/make_tarball.sh :/!.cargo/config.toml
28 lines
726 B
Plaintext
28 lines
726 B
Plaintext
# normalize newlines
|
|
* text=auto eol=lf
|
|
|
|
# let git show off diff hunk headers, help git diff -L:
|
|
# https://git-scm.com/docs/gitattributes
|
|
*.c diff=cpp
|
|
*.h diff=cpp
|
|
*.py diff=py
|
|
*.rs diff=rust
|
|
# add a [diff "fish"] to git config with pattern
|
|
*.fish diff=fish
|
|
|
|
# omit from git archive
|
|
.gitattributes export-ignore
|
|
.gitignore export-ignore
|
|
/build_tools/make_tarball.sh export-ignore
|
|
/.github export-ignore
|
|
/.github/* export-ignore
|
|
/.builds export-ignore
|
|
/.builds/* export-ignore
|
|
|
|
# for linguist, which drives GitHub's language statistics
|
|
alpine.js linguist-vendored
|
|
doc_src/** linguist-documentation
|
|
*.fish linguist-language=fish
|
|
# see 70f2899fcd which attempts to "rig the count"
|
|
share/completions/*.fish linguist-documentation
|