Comments (3)
conda-forge/emacs-feedstock#80 (comment) :
We might be able to do either
*.path -text *.diff -textor
*.path binary diff *.diff binary diff. IDK which one would work/be preferred.
Looking at https://github.com/git/git/blob/v2.43.0/attr.c#L662 it seems we have binary
defined as
[attr]binary -diff -merge -text
. So,
*.path -merge -text
*.diff -merge -text
would probably suffice to address the reported issue while still retaining the desired behavior with Git not break source line ending depending on the users' configurations.
from conda-smithy.
Maybe we can try one of these changes in a PR?
IIRC the line ending issue was tricky to get right depending on whether the user was on UNIX or Windows also depending on whether the patch/source code was written on UNIX or Windows. So we probably want to test all 4 cases to make sure that things behave as intended
from conda-smithy.
Maybe we can try one of these changes in a PR?
Yes, it would be nice if someone could try it out.
IIRC the line ending issue was tricky to get right depending on whether the user was on UNIX or Windows also depending on whether the patch/source code was written on UNIX or Windows.
Yes, depending on the users' Git settings and platforms they use things can break easily.
A good example to test things out for would be python-feedstock
since we do have patches for files with different line endings in there.
So we probably want to test all 4 cases to make sure that things behave as intended
No, we'd only need to test the
*.patch -merge -text
*.diff -merge -text
case.
binary
is just an alias for -diff -merge -text
.
So, the minimal change to get diff
to display contents of *.patch
/*.diff
without risking further issues is just to remove the -diff
part of binary
.
See https://git-scm.com/docs/gitattributes/2.43.0 for details (search for -diff
/-text
).
from conda-smithy.
Related Issues (20)
- Add CI tests for deprecation notices and `conda`/`conda-build` pre-release versions
- ENH: Take into account `stdlib_version` for determining macOS SDK version in `.ci_support/` and cf-ci-setup HOT 2
- Soften "selectors in noarch" lint for some cases
- abi_migration_branches validation too strict HOT 2
- Move BotConfig to regro/cf-scripts and use it in conda-smithy HOT 9
- Unexpected top-level keys in conda-forge.yml fail to display anything
- Nonexistent conda-forge.yml should raise an error
- Investigate `deprecated` Pydantic Field argument
- Missing auxlib.packaging
- add default branches that are ignore by smithy for uploads HOT 2
- Flawed conda-forge-only meta.yaml lint #1 (already-exists lint): Multiple PyPI sources
- Unable to install conda-smithy using the conda install command (gets killed) HOT 1
- ENH: Warn on non-existent `abi_migration_branches`
- BUG: smithy ignores keys in migrator when affected by zipping logic HOT 2
- Release 3.35.0 HOT 8
- BUG: something non-deterministic going wrong in squished_input_variants/preserve_top_level_loops HOT 4
- Linter hint about `{{ stdlib("c") }}` variable is incorrect for noarch packages HOT 1
- conda-smithy rendered circle ci config for feedstocks don't run HOT 1
- BUG: MACOSX_SDK_VERSION not participating in merge logic HOT 7
- lint on most wheel-based python installs except `noarch: python` and `none-any.whl` HOT 3
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from conda-smithy.