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-07-15 14:28:21 -04:00
commit 4e44bda4cc
4 changed files with 50 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/Windows_daemon_silently_dies/comment_1_b590aaeedec78c8540d549a8c773881e._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 1"
date="2014-07-15T17:36:22Z"
content="""
I doubt that it has anything to do with a ssh remote.
Please enable debug logging and see if you can get a more detailed log around when it dies.
"""]]

16
doc/forum/Ssh_remote_on_NAS/comment_2_261601313d8825c52322949b8509bc74._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="feulif"
ip="20.133.1.1"
subject="comment 2"
date="2014-07-15T18:03:56Z"
content="""
> How did you set your PATH? Note that the bash shell provides a lot of dotfiles which you can set the PATH in -- and reuses to read any single one of them when a noninteractive login is made to run a command.
Actually I didn't set the PATH: I've just sim-linked executable files from git-annex stand-alone folder to a directory that was in my PATH already.
> It might help to install git on the NAS. It's included in the git-annex tarball, but not in a way that will put it on PATH; only in a way that will let git-annex use it.
It was installed, bud I've removed it because it was \"conflicting\" with the one used by git-annex. That is, when I ran any \"git annex ...\" command, git was complaining it could not find git-annex (because my nas was running the installed git binary file).
Without git, I don't have this conflict anymore and I can effectively use git-annex when I'm logged in my NAS, but I still can't add it as an SSH remote.
"""]]

10
doc/forum/repo_corruption_in_usb_external_drive.mdwn
View file

@ -28,4 +28,14 @@ In addition making a git-annex info gives the following:
What should I do? delete the usb repo and start again. Thank god this is just a trial.
What happens if a file gets corrupted. Lets say it is corrupted in repo A, and fine in repo B. Will the good copy be overridden?
git-repair takes a long time and seems to be stuck there, or maybe it just takes a long time (10Gb repo). Is this normal?
> git-annex repair
Running git fsck ...
Initialized empty Git repository in /tmp/tmprepo.1/.git/
Trying to recover missing objects from remote sapo.
Unpacking all pack files.
Unpacking objects: 100% (348848/348848), done.
Thanks in advance.

14
doc/todo/Recovering_from_a_bad_sync/comment_3_4d4904bcbf97401c7c11338f32577f96._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 3"
date="2014-07-15T18:23:50Z"
content="""
Making `git annex sync` automatically sync with remotes with no annex-uuid is more complicated than I first thought.
In the case of a remote accessed over ssh, `git annex sync` already does sync with such a remote. Of course, it will set annex-ignore on it, since it has no annex-uuid. (Needed eg, for github, or just for preventing a repo from being used by git-annex if you don't want it to be.) Still, the git branches get synced, which is the behavior that we want.
So, only local remotes are affected. Note that `git annex assistant` automatically git-annex inits the local remote when it lacks a uuid, and syncs with it. That seems ok.
However `git annex sync` currently ignores the local remote when it has no uuid. Seems that this happens due to a bug, not intentionally. tryGitConfigRead tries to bootstrap up an annex state to read the repos's config, but this cannot be done in a repo that is not yet initialized. Result is the repo state is not read, and so it's treated as a local remote that is not currently available (ie, a disconnected disk).
"""]]