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 2016-06-22 16:25:02 -04:00
commit 640a24d039
Failed to extract signature
3 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
doc/bugs/bare_remote_is_not_automatically_synced_to_local_repo.mdwn Normal file
View file

@ -0,0 +1,15 @@
### Please describe the problem.
I have a git annex repository at `~/doc` which has a remote stored on a second drive at `/media/backup/doc.git`, which is a bare git annex repo. The webapp is run from `~/doc`. Changes are made to `/media/backup/doc.git` by syncing from other computers, but then those changes to the remote are not automatically propagated to `~/doc` by the webapp.
The use case that lead to this situation is syncing several computers to a large hard drive on a server, utilizing a bare repo as a full backup, and then wishing to have a client repo in the home folder on the server. So other computers sync their repos to `/media/backup/doc.git` and then any changes should be propagated to `~/doc` on the server.
Changes made to `~/doc` *are* synced to the backup repository on the backup hard drive, and those changes are almost immediately synced to the other machines by the webapp running on those respective machines. Those computers are configured to connect to `/media/backup/doc.git` on the server using SSH only (and git-annex-shell on the server), and do not use XMPP.
### What version of git-annex are you using? On what operating system?
The amd64 pre-built tarball, git-annex version: 6.20160613-g35dbe35, running on Ubuntu 16.04.
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Migrated all of my syncing to git annex about 10 months ago and haven't had any significant trouble :)

9
doc/news/version_6.20160613/comment_1_89cfca1174ea3e50a536053e73027296._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="CandyAngel"
subject="comment 1"
date="2016-06-21T08:46:50Z"
content="""
Improve SHA*E extension extraction code.
This sounds really likely to break things like [recovering files by readding](https://git-annex.branchable.com/tips/recover_data_from_lost+found/), because the key is going to be different, despite having the same backend..
"""]]

14
doc/tips/largefiles/comment_4_b6380286f60c1cd46a82a2e90c7aa05f._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="christophfischer@4706e95f48874dfd46092b278315693b92ea7d23"
nickname="christophfischer"
subject="how to recursively exclude files from git-annex (.gitattributes)"
date="2016-06-21T11:42:37Z"
content="""
Hello
it took me some time to figure out how to exclude directories matching a specific structure within the .gitattributes file:
**/some_dir/**/below_this_dir_is_everything_in_plane_text/**/* annex.largefiles=nothing
Maybe it helps someone else. (In case this way is the intended way)
"""]]