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-01-02 12:04:17 -04:00
commit 7d5568485f
5 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_3_93f20519483837c59a75821621e22dee._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 3"
date="2014-01-02T02:05:05Z"
content="""
AFAICS, git-merge was still running when you ctrl-c'd it. So this is coming before git-annex processes the merge to update the work tree.
I don't know why it would take so long to run, especially if it was not using CPU or disk. You might try to reproduce the problem, passing --debug to git-annex, and perhaps strace the git-merge process to see what it's doing.
"""]]

8
doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_4_ff6c1e93e20fc79b40eb5f05ac4c311f._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns"
nickname="Jan Ulrich"
subject="Thanks"
date="2014-01-02T07:02:03Z"
content="""
Cool, I'll try to use git-annex on my MacBook in a couple of days again. In which version the fix was applied?
"""]]

48
doc/tips/Synology_NAS_and_git_annex.mdwn Normal file
View file

@ -0,0 +1,48 @@
# How to use git-annex on a Synology NAS
This is known to work with DSM 4.3-3810 Update 1 and git-annex standalone version 5.20131224-g6ca5271.
## Installation Steps
1. In the DSM Package Center, install Git, which is available from Synology (no third-party repository needed).
2. Download the latest [[standalone|Linux_standalone]] git-annex build for Linux on armel.
3. Extract it somewhere sensible (eg: a bin/ directory your users home directory)
4. Go into the git-annex.linux directory and ./runshell. You can now run git-annex as you normally would.
## How to sync with the Synology NAS
### On the Synology
1. Setup port forwarding and associated dynamic dns, if applicable. Many good guides online for this.
2. Setup ssh key based authentication with the Synology for each computer you want to sync with it. You want a specific key that is used only by git-annex, for each computer. Again, many good guides online.
3. In the Synology .ssh/authorized_keys file for your account, add (substituing your username)
[[!format sh """
command="/home/$yourusername/.ssh/git-annex-shell"
"""]]
to the beginning of the line. Eg, it would look like this:
[[!format sh """
command="/home/greg/.ssh/git-annex-shell" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT1yE96E/JQNPt0ziiNYJRvndCvLK4uG5h/SNYoAIBF1uH6L7VYAt3HWVqSyi3BcV70WDZ/yWgtNzbrcir46JpvEHMcvYaXLbANwoDGNjG/gsz7kP/8VUxZ6hG3P3ICuwnqVum5+rYXm6oj3xzWPfTRhhRoDZLOQdevSNpdGNaa/lSg8Vuq2suHwjQlQb8AIUuCZmS5cm6XwoUq/jJtN4LTuTPqMjzA6NkdhWM2Kigi9jPQBFborkYBPMphmZwBZiVnhsH1XpaOff+mP03D2gF/huC+b1vbWQstjuehUbY59rvJ4ijb3810Uq2ep7dwLagmILtX5GbL+GS64pAn9sIP annex-othercomputer
"""]]
4. the git-annex-shell script in your .ssh should be created for you aftering your initial ./runshell
5. Double check that the script points to the correct directory of where your extracted git-annex.linux lives.
### On the other computers - the manual way
1. See step 2 above about creating the specific git-annex ssh keys.
2. In your .ssh/config, create an alias for your Synology that includes specifying the right sshkey. For example, mine looks like:
[[!format sh """
Host synologyhost
HostName mydynamicdomain.no-ip.org
IdentityFile /home/greg/.ssh/annex_rsa
"""]]
3. Now when you clone the git repo from the Synology, or add it as a remote, do the following:
[[!format sh """
git clone greg@synologyhost:/absolute/path/to/annexname annexname
"""]]
or
[[!format sh """
git remote add synology greg@synologyhost:/absolute/path/to/annexname
"""]]
4. Run git-annex sync
### On the other computers - Using the assistant
1. Use the webapp to add the remote. I'm not sure if there are any gotchas here as I have not done it this way yet.

10
doc/todo/wishlist:_git_annex_info_UUID/comment_1_d0d40bfdafed47e9e8ef2f4cd5c8576f._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 1"
date="2014-01-02T02:16:10Z"
content="""
git-annex vicfg shows everything (except location tracking info and some remote.log stuff that it would be hard to present in any useful way).
It would be good to make `git annex info` segment its list of repos by group. The only other information is location tracking info and scheduling, which I think vicfg gives a good overview of.
"""]]

8
doc/todo/wishlist:_git_annex_info_UUID/comment_2._comment Normal file
View file

@ -0,0 +1,8 @@
One piece of information that's sometimes useful, but not always, is to get a count of keys present in another remote plus the size of the remote.
Thus, I could verify that some repos are empty, archive repos have every single file, etc etc.
I still think that info is best suited for `git annex info name/UUID` as it's more volatile than what `git annex vicfg` displays.
Richard