Skip to content

Commit

Permalink
gitattributes: improve GitHub and local git treatment of corpus and A…
Browse files Browse the repository at this point in the history
…PI generated files. (envoyproxy#11742)

- Ignore v4alpha in GitHub diffs, since v4 is some ways away, reduce the amount of noise in reviews.
- Get rid of rules for .generated.pb_text, I don't think we have any of these today.
- Don't treat API generated files as binary locally, this causes pain when doing manual fixups on patches for CVEs, as they appear as binary diffs.

Signed-off-by: Harvey Tuch <htuch@google.com>
  • Loading branch information
htuch authored and songhu committed Jun 25, 2020
1 parent 7009f49 commit e0818a1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/docs/root/version_history/current.rst merge=union
*.generated.pb_text linguist-generated=true
*.generated.pb_text -diff -merge
/api/envoy/**/v4alpha/* linguist-generated=true
/generated_api_shadow/envoy/** linguist-generated=true
/generated_api_shadow/envoy/** -diff -merge
/generated_api_shadow/bazel/** linguist-generated=true
/generated_api_shadow/bazel/** -diff -merge
*.svg binary
/test/**/*_corpus/* linguist-generated=true
/test/**/*_corpus/* -diff -merge

0 comments on commit e0818a1

Please sign in to comment.