Skip to content

Commit f04b3d4

Browse files
phillipwoodgitster
authored andcommitted
templates: add .gitattributes entry for sample hooks
The sample hooks are shell scripts but the filenames end with ".sample" so they need their own .gitattributes rule. Update our editorconfig settings to match the attributes as well. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 67ad421 commit f04b3d4

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ insert_final_newline = true
44

55
# The settings for C (*.c and *.h) files are mirrored in .clang-format. Keep
66
# them in sync.
7-
[{*.{c,h,sh,bash,perl,pl,pm,txt,adoc},config.mak.*,Makefile}]
7+
[{*.{c,h,sh,bash,perl,pl,pm,txt,adoc},config.mak.*,Makefile,templates/hooks/*.sample}]
88
indent_style = tab
99
tab_width = 8
1010

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ CODE_OF_CONDUCT.md -whitespace
1818
/Documentation/user-manual.adoc conflict-marker-size=32
1919
/t/t????-*.sh conflict-marker-size=32
2020
/t/unit-tests/clar/test/expected/* whitespace=-blank-at-eof
21+
/templates/hooks/*.sample whitespace=indent,trail,space,incomplete text eol=lf

0 commit comments

Comments
 (0)