1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 01:09:47 +01:00
Commit Graph

4 Commits

Author SHA1 Message Date
chrysn
1273f2940f rust: Treat Cargo.lock files as opaque
Cargo.lock files pin the versions of all transitive dependencies, and
are left that way by Cargo unless requested manually (`cargo update`) or
necessitated by a change in dependencies (if the manually maintained
Cargo.toml says `>0.5.2` and .lock says `0.5.1`, the latter is reset).

They are fixed (as opposed to .gitignoring them and letting each user
autogenerate them) to ensure that third party changes do not break RIOT
CI builds; for updates, the changes from a `cargo update` can still be
committed and then run through CI checks. (This is analogous to how pkg
versions are pinned).

They are set to binary because their diffs are usually not practical to
read.
2021-12-14 13:27:42 +01:00
Oleg Hahm
6fdc9ca742 git: handle patch files as binary 2015-12-04 11:46:33 +01:00
Joakim Gebart
d3b30417cc .gitattributes: add markdown special case.
Increase conflict marker size to avoid false positives with git diff --check

(The conflict marker is a line of equals signs `=` which is inserted whenever there is a merge conflict)
2015-05-09 11:23:09 +02:00
René Kijewski
2f66319a3a make: OSX: don't fail for empty .a archives
Fixes issue #1333.
2014-06-24 20:29:32 +02:00