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

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

Browse source
This commit is contained in:
Joey Hess 2014-12-18 14:52:04 -04:00
commit 778012cf40
7 changed files with 76 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/forum/Git_Annex_not_dropping_unused_content.mdwn Normal file
View file

@ -0,0 +1,9 @@
I've deleted some files, but their content remains in the objects directory, and *git annex unused* does not list them.
I've read in this post <http://git-annex.branchable.com/forum/git-annex_unused_not_dropping_deleted_files/> that if other branches contain the files, then it won't count them as unused. My repo appears to have a few branches left over from views I've used.
remotes/sdrive/views/(added=14_09);(tag=Shared)
remotes/sdrive/views/(added=14_09);Images_=_
remotes/sdrive/views/added=_
How can I delete these? Is git annex going to create a new branch for every new view I create?

7
doc/forum/Recovery_after_freeze_while_importing_files/comment_2_e14f330de3e9ebfa9a99c32e65d59d11._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="ghen1"
subject="comment 2"
date="2014-12-18T11:28:35Z"
content="""
I did, and everything seems fine.
"""]]

14
doc/forum/repair_stuck_on_ls-tree_command/comment_10_791c50f8a2284b704e34cacf15637341._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="vho"
subject="comment 10"
date="2014-12-18T10:27:07Z"
content="""
This one should work:
https://www.dropbox.com/s/t7b406wm6m3vm6c/photos2.tar.xz.gpg?dl=0
$ md5sum photos2.tar.xz.gpg
df2b9bde3d1ad23d9f3c4247d2f5b21a photos2.tar.xz.gpg
$ sha1sum photos2.tar.xz.gpg
cac6f8c07a1d95fb48e3d9aa0f4699a2c77c00d598 photos2.tar.xz.gpg
"""]]

7
doc/forum/repair_stuck_on_ls-tree_command/comment_9_163cdd18380a13aaa13d68d516af1e30._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="vho"
subject="failed upload"
date="2014-12-18T09:18:14Z"
content="""
It seems the upload failed at some point. I am going to share it somewhere else
"""]]

9
doc/news/sharebox_a_FUSE_filesystem_for_git-annex/comment_5_b92045c91d92da7db794aed2c67dde0d._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="CandyAngel"
subject="comment 5"
date="2014-12-18T09:26:17Z"
content="""
Having the lean view would be easy to implement either as an option you pass when mounting or something you can toggle by touching a file ($MNT/.config/lean/{on,off}).
Regarding fetching of files, how would you like it to behave? My previous one would return EBUSY while downloading a file and ENODATA if it wasn't available and couldn't be fetched. I could, for example, make unavailable files appear as normal files (containing text regarding the download state) until they are available, then they become symlinks. What would work best for you?
"""]]

9
doc/news/sharebox_a_FUSE_filesystem_for_git-annex/comment_6_6f3b5d5a5781b3a570f46481dc2ebca2._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
nickname="Yaroslav"
subject="unavailable files"
date="2014-12-18T16:37:13Z"
content="""
for my use cases the best would be if FUSE simply didn't return until file becomes available. Making an option to return immediately with EBUSY/ENODATA could also be generally useful but not in my case :-/
I wonder if any timeout would kick in in some use-cases if it takes too long?
"""]]

21
doc/todo/inject_on_import.mdwn Normal file
View file

@ -0,0 +1,21 @@
Would it be possible to add an `--inject` option to import?
Say, for example, I have an annex on computer A which has a subset of files and a directory of files which are potentional duplicates of files in the annex.
I would like to do something like this:
mkdir ~/annex/import
cd ~/annex/import
git annex import --deduplicate --inject ~/directory/of/files
This would do the same as `--deduplicate`, except if the file is not present in the annex, it would be injected. For example:
Annex knows about A and B, A is present but B is not.
$DIR contains A, B and C.
A would be deleted from $DIR due to `--deduplicate`.
B would be injected into the repo (making it present) due to `--inject`, then deleted from $DIR.
C would be added to the annex, resulting in this
$ ls ~/annex/import
C