From f35cc2d4ba321cca81e4129b39ddaf5c44cd7448 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 16 Nov 2013 18:48:16 -0400 Subject: [PATCH] Android: Adjust default .gitignore to ignore .thumbnails at any location in the tree, not just at its top. --- Assistant/WebApp/Configurators/Local.hs | 2 +- debian/changelog | 2 ++ doc/bugs/gitignore_for_DCIM_on_Android_misses_some_files.mdwn | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs index c062c363d2..b47576b6ed 100644 --- a/Assistant/WebApp/Configurators/Local.hs +++ b/Assistant/WebApp/Configurators/Local.hs @@ -168,7 +168,7 @@ getAndroidCameraRepositoryR = where addignore = do liftIO $ unlessM (doesFileExist ".gitignore") $ - writeFile ".gitignore" ".thumbnails/*" + writeFile ".gitignore" ".thumbnails" void $ inRepo $ Git.Command.runBool [Param "add", File ".gitignore"] diff --git a/debian/changelog b/debian/changelog index b858e2d056..9e8886614a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ git-annex (5.20131102) UNRELEASED; urgency=low Thanks to Tim for the test case. * fsck: Fix up .git/annex/object directory permissions. * Switched to the tasty test framework. + * Android: Adjust default .gitignore to ignore .thumbnails at any location + in the tree, not just at its top. -- Joey Hess Wed, 06 Nov 2013 16:14:14 -0400 diff --git a/doc/bugs/gitignore_for_DCIM_on_Android_misses_some_files.mdwn b/doc/bugs/gitignore_for_DCIM_on_Android_misses_some_files.mdwn index a7b97de680..449a99753e 100644 --- a/doc/bugs/gitignore_for_DCIM_on_Android_misses_some_files.mdwn +++ b/doc/bugs/gitignore_for_DCIM_on_Android_misses_some_files.mdwn @@ -13,3 +13,5 @@ Create a repo Nightly build for Android from yesterday (2013-11-16) ### Please provide any additional information below. + +> [[fixed|done]] --[[Joey]]