diff options
| author | zeripath <art27@cantab.net> | 2021-09-09 21:13:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 21:13:36 +0100 |
| commit | 248b96d8a38b2d52a73d7091a82f688f4688295e (patch) | |
| tree | 43dfd0341cfbd86d576c1de073f8ad060f84b60b /options | |
| parent | b83b4fbef9df7bb4beef5684b18fe2ef210c42a2 (diff) | |
| download | gitea-248b96d8a38b2d52a73d7091a82f688f4688295e.tar.gz gitea-248b96d8a38b2d52a73d7091a82f688f4688295e.zip | |
Use git attributes to determine generated and vendored status for language stats and diffs (#16773)
Replaces #16262
Replaces #16250
Replaces #14833
This PR first implements a `git check-attr` pipe reader - using `git check-attr --stdin -z --cached` - taking account of the change in the output format in git 1.8.5 and creates a helper function to read a tree into a temporary index file for that pipe reader.
It then wires this in to the language stats helper and into the git diff generation.
Files which are marked generated will be folded by default.
Fixes #14786
Fixes #12653
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3462a15cca..17701094d7 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2011,6 +2011,8 @@ diff.file_byte_size = Size diff.file_suppressed = File diff suppressed because it is too large diff.file_suppressed_line_too_long = File diff suppressed because one or more lines are too long diff.too_many_files = Some files were not shown because too many files changed in this diff +diff.generated = generated +diff.vendored = vendored diff.comment.placeholder = Leave a comment diff.comment.markdown_info = Styling with markdown is supported. diff.comment.add_single_comment = Add single comment |