From 810f5663f0a3c2773a8a2033f932aa5703030f1b Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Thu, 30 Mar 2017 14:18:37 -0700 Subject: [PATCH] (MAINT) Fix .gitattributes for module development on Windows Previously the .gitattributes file, which is managed by modulesync, was updated to set ERB files to LF line endings. However on Windows ERB files can be used to generate files in either line endings. Also as the current ERB file is CRLF when this file is cloned on a Window filesystem, it detects this file has changed, which in turn blocks git functions such as rebasing or checking out. This commit modifies the .sync.yml to exclude ERB files from the .gitattributes setting and let these files manage line endings on their own. --- .gitattributes | 1 - .sync.yml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 02d4646b..ea2b0467 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ #This file is generated by ModuleSync, do not edit. *.rb eol=lf -*.erb eol=lf *.pp eol=lf *.sh eol=lf diff --git a/.sync.yml b/.sync.yml index 80475e23..6df81c5e 100644 --- a/.sync.yml +++ b/.sync.yml @@ -24,6 +24,11 @@ - "/.vscode/" - ".config" +.gitattributes: + # As this is for Windows, ERB files can be either LF or CRLF + exclude: + - "*.erb" + Gemfile: optional: ':system_tests':