Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2013-06-10 11:09:08 -04:00
commit 7c45b9c48b
3 changed files with 56 additions and 1 deletions

View file

@ -0,0 +1,23 @@
### Please describe the problem.
When creating a Camera repository on android, the .thumbnails/ directory (containing useless crushed JPGs and even more useless oodles of thumbnail metadata databases) is annexed. This leads to confusion (assistant tries to annex database and thumbnails in modification) and waste (uploading/annexing unusable/unneeded metadata).
### What steps will reproduce the problem?
Install git-annex on Android and choose the defaults for a camera repository.
### What version of git-annex are you using? On what operating system?
4.20130601, Android 4.2.2
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]

View file

@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
want the first time they run it, but to save typing on android, anything
that gets enough votes will be included in a list of choices as well.
[[!poll open=yes expandable=yes 47 "/sdcard/annex" 4 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
[[!poll open=yes expandable=yes 48 "/sdcard/annex" 4 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]

View file

@ -0,0 +1,32 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo"
nickname="Justin"
subject="comment 1"
date="2013-06-10T14:23:25Z"
content="""
justin@box:/tmp/f$ git init
Initialized empty Git repository in /tmp/f/.git/
justin@box:/tmp/f$ git-annex init
init ok
(Recording state in git...)
justin@box:/tmp/f$ cp /etc/motd .
justin@box:/tmp/f$ git-annex add .
add motd (checksum...) ok
(Recording state in git...)
justin@box:/tmp/f$ git-annex fsck
fsck motd (checksum...) ok
justin@box:/tmp/f$ chmod +w motd
justin@box:/tmp/f$ echo hi >> motd
justin@box:/tmp/f$ git-annex fsck
fsck motd
Bad file size (3 B larger); moved to /tmp/f/.git/annex/bad/SHA256-s354--2e724dde1a5dc33bc15580b2aef1ee541ca8047d746fff9bb7917062b871c0bf
** No known copies exist of motd
failed
(Recording state in git...)
git-annex: fsck: 1 failed
You can also use fsck -q which will only show errors.
"""]]