mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

assistant: Ignore .DS_Store on OSX.

Browse source
This commit is contained in:
Joey Hess 2013-01-28 15:13:22 +11:00
parent 981dbc02f5
commit a8bb2749b2
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/Threads/Watcher.hs
View file

@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable CPP #-}
module Assistant.Threads.Watcher ( module Assistant.Threads.Watcher (
watchThread, watchThread,
@ -146,6 +146,9 @@ ignored = ig . takeFileName
ig ".git" = True ig ".git" = True
ig ".gitignore" = True ig ".gitignore" = True
ig ".gitattributes" = True ig ".gitattributes" = True
#ifdef darwin_HOST_OS
ig ".DS_Store" = True
#endif
ig _ = False ig _ = False
type Handler = FilePath -> Maybe FileStatus -> Assistant (Maybe Change) type Handler = FilePath -> Maybe FileStatus -> Assistant (Maybe Change)

1
debian/changelog vendored
View file

@ -7,6 +7,7 @@ git-annex (3.20130125) UNRELEASED; urgency=low
* annex.autocommit: New setting, can be used to disable autocommit * annex.autocommit: New setting, can be used to disable autocommit
of changed files by the assistant, while it still does data syncing of changed files by the assistant, while it still does data syncing
and other tasks. and other tasks.
* assistant: Ignore .DS_Store on OSX.
-- Joey Hess <joeyh@debian.org> Sat, 26 Jan 2013 15:48:40 +1100 -- Joey Hess <joeyh@debian.org> Sat, 26 Jan 2013 15:48:40 +1100

6
doc/bugs/DS__95__Store_not_gitignored.mdwn
View file

@ -18,3 +18,9 @@ OS X Lion
Please provide any additional information below. Please provide any additional information below.
> Assistant does not support .gitignore yet. Requires an efficient query
> interface for ignores, which git does not provide.
>
> However, I've added a special case, OSX only ignore for .DS_Store files.
> [[done]] --[[Joey]]