diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-28 15:13:22 +1100 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-28 15:13:22 +1100 |
| commit | 5377e47d133b1406a2c43da6a0c81eea6a24020d (patch) | |
| tree | ff55d09448b41dc68b00ba29fd9898aeb55da9d4 | |
| parent | fdfd8790fd4471392fb6b843ed813e10eb61e8fc (diff) | |
assistant: Ignore .DS_Store on OSX.
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/DS__95__Store_not_gitignored.mdwn | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 9c0439231..6a54ffbff 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE DeriveDataTypeable CPP #-} module Assistant.Threads.Watcher ( watchThread, @@ -146,6 +146,9 @@ ignored = ig . takeFileName ig ".git" = True ig ".gitignore" = True ig ".gitattributes" = True +#ifdef darwin_HOST_OS + ig ".DS_Store" = True +#endif ig _ = False type Handler = FilePath -> Maybe FileStatus -> Assistant (Maybe Change) diff --git a/debian/changelog b/debian/changelog index d7b89c2dd..2bab763b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ git-annex (3.20130125) UNRELEASED; urgency=low * annex.autocommit: New setting, can be used to disable autocommit of changed files by the assistant, while it still does data syncing and other tasks. + * assistant: Ignore .DS_Store on OSX. -- Joey Hess <joeyh@debian.org> Sat, 26 Jan 2013 15:48:40 +1100 diff --git a/doc/bugs/DS__95__Store_not_gitignored.mdwn b/doc/bugs/DS__95__Store_not_gitignored.mdwn index 3de5a6a78..269eb417a 100644 --- a/doc/bugs/DS__95__Store_not_gitignored.mdwn +++ b/doc/bugs/DS__95__Store_not_gitignored.mdwn @@ -18,3 +18,9 @@ OS X Lion 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]] + |