Merge branch 'ignore-.github' of https://github.com/matthijskooijman/arduino-builder

cmaglie · cmaglie · commit cf5e8368017a · 2016-06-23T11:38:34.000+02:00
Signed-off-by: Cristian Maglie &lt;c.maglie@arduino.cc&gt;
diff --git a/src/arduino.cc/builder/utils/utils.go b/src/arduino.cc/builder/utils/utils.go
@@ -146,7 +146,7 @@ func FilterFilesWithExtension(extension string) filterFiles {
 	}
 }
 
-var SOURCE_CONTROL_FOLDERS = map[string]bool{"CVS": true, "RCS": true, ".git": true, ".svn": true, ".hg": true, ".bzr": true}
+var SOURCE_CONTROL_FOLDERS = map[string]bool{"CVS": true, "RCS": true, ".git": true, ".github": true, ".svn": true, ".hg": true, ".bzr": true}
 
 func IsSCCSOrHiddenFile(file os.FileInfo) bool {
 	return IsSCCSFile(file) || IsHiddenFile(file)

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ func FilterFilesWithExtension(extension string) filterFiles {`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`-var SOURCE_CONTROL_FOLDERS = map[string]bool{"CVS": true, "RCS": true, ".git": true, ".svn": true, ".hg": true, ".bzr": true}`
	`149`	`+var SOURCE_CONTROL_FOLDERS = map[string]bool{"CVS": true, "RCS": true, ".git": true, ".github": true, ".svn": true, ".hg": true, ".bzr": true}`
`150`	`150`
`151`	`151`	`func IsSCCSOrHiddenFile(file os.FileInfo) bool {`
`152`	`152`	`return IsSCCSFile(file) \|\| IsHiddenFile(file)`