diff options
author | Joey Hess <joey@kitenet.net> | 2013-06-10 11:09:08 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-06-10 11:09:08 -0400 |
commit | 89067d216f8d3d3f7693c07ab6c61ccc6c16e62c (patch) | |
tree | e88aba234c7350d576620c5bf15406b3c16d1ce7 | |
parent | 97b4525e5d405c58c1c0b6bf6b0ec5260cbf523e (diff) | |
parent | 67ff45140c2715b59947ad2395629b0724dc4dc0 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
3 files changed, 56 insertions, 1 deletions
diff --git a/doc/bugs/Should_ignore_.thumbnails__47___on_android.mdwn b/doc/bugs/Should_ignore_.thumbnails__47___on_android.mdwn new file mode 100644 index 000000000..b24eb7b45 --- /dev/null +++ b/doc/bugs/Should_ignore_.thumbnails__47___on_android.mdwn @@ -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. +"""]] diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index 038bee344..b8587cf84 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -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/"]] diff --git a/doc/forum/How_do_you_know_when_something_fails_a_fsck__63__/comment_1_1c14981916dd55376d5e9f95023556cb._comment b/doc/forum/How_do_you_know_when_something_fails_a_fsck__63__/comment_1_1c14981916dd55376d5e9f95023556cb._comment new file mode 100644 index 000000000..042a1c46a --- /dev/null +++ b/doc/forum/How_do_you_know_when_something_fails_a_fsck__63__/comment_1_1c14981916dd55376d5e9f95023556cb._comment @@ -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. + +"""]] |