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

This commit is contained in:
Joey Hess 2013-11-02 21:07:32 -04:00
commit 230409441c
7 changed files with 129 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.47"
subject="comment 1"
date="2013-11-03T00:29:14Z"
content="""
Pairing sets up the same kind of dedicated passwordless ssh key that is used when adding a ssh server.
It's not clear from your description what program is asking for the password, or even if it's asking for the password for a ssh key. You need to provide more details.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU"
nickname="Adam"
subject="comment 2"
date="2013-11-03T00:39:38Z"
content="""
I'm not sure which program is doing the asking either. The title bar says \"OpenSSH\". It is asking for the SSH key password, but if I dismiss the dialog without entering the password, it will open another dialog asking for the user account's password, e.g. me@laptop, indicating it's SSH falling back to password auth.
"""]]

View file

@ -0,0 +1,40 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU"
nickname="Adam"
subject="config from backup repo"
date="2013-11-03T00:20:11Z"
content="""
Sorry for posting over and over again, just trying to provide info when I discover it.
Here's **/mnt/debian/home/me/annex-backup/.git/config**
[[!format sh \"\"\"
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[annex]
uuid = 86535965-6ca7-4bf3-89af-bca3a07f96f9
version = 3
direct = true
fscknudge = true
diskreserve = 100 megabyte
numcopies = 1
debug = false
[gc]
auto = 0
[remote \"desktop\"]
url = /home/me/annex
fetch = +refs/heads/*:refs/remotes/desktop/*
annex-uuid = 80709bc2-3cbe-434b-b7b9-306278b9a4e9
[remote \"Remote\"]
annex-rsyncurl = username@example.net:annex/
annex-uuid = 33930bae-63d2-4a52-b330-58872aaeb1bf
annex-sync = false
fetch =\"\"\"]]
1. Should I remove the \"Remote\" Transfer repo from this config file to prevent it from using the Transfer repo? I only want this repo to sync directly with the other internal hard disk.
2. Is it correct for git-annex to add this Transfer repo to this config file in the first place?
"""]]

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.47"
subject="comment 7"
date="2013-11-03T00:45:09Z"
content="""
* The costs you show look fine.
* Yes, deleting a repository in the webapp actually deletes it. It doesn't just remove the remote from .git/config. Most people using the webapp don't want to draw such a fine distinction, I think.
* It's not a very usual configuration to have 2 repositories on the same machine with the git-annex assistant running in both. You might just want to configure the assistant to not run in the backup repository.
Some of the things you've said suggest that the backup repository might not be immediately noticing when changes are pushed to it. Since its location is shown as /mnt/debian/home/me, I have to wonder if that's some NFS mount or other network filesystem causing problems.
"""]]

View file

@ -0,0 +1,42 @@
### Please describe the problem.
git-annex assistant is currently running. Here is the output of **ps -A u | grep -i git**:
[[!format sh """
5457 pts/2 Z+ 0:00 [git-annex] <defunct>
5510 ? Sl 0:05 git-annex assistant
5522 ? S 0:00 git --git-dir=/home/me/annex/.git --work-tree=/home/me/annex cat-file --batch
5573 ? S 0:00 git --git-dir=/home/me/annex/.git --work-tree=/home/me/annex cat-file --batch
5679 ? SN 0:00 git --git-dir=/home/me/annex/.git --work-tree=/home/me/annex check-attr -z --stdin annex.backend annex.numcopies --
5680 ? Z 0:03 [git-annex] <defunct>
5710 ? Z 0:00 [git-annex] <defunct>
5732 pts/2 Z+ 0:00 [git-annex] <defunct>
5752 pts/2 Z+ 0:00 [git-annex] <defunct>
5785 ? Ss 0:00 ssh: .git/annex/ssh/example.net [mux]
5905 ? Z 0:00 [git-annex] <defunct>
5923 ? Z 0:00 [git-annex] <defunct>
6513 pts/2 Z+ 0:00 [git-annex] <defunct>
6552 ? Z 0:00 [git-annex] <defunct>
7797 ? Z 0:00 [git-annex] <defunct>
7873 pts/2 Z 0:00 [git-annex] <defunct>
8708 pts/2 Z+ 0:00 [git-annex] <defunct>
9821 ? Z 0:00 [git-annex] <defunct>
9841 pts/2 Z+ 0:00 [git-annex] <defunct>
10462 ? Z 0:00 [git-annex] <defunct>
10522 pts/2 Z 0:00 [git-annex] <defunct>
12777 pts/2 Z+ 0:00 [git-annex] <defunct>
13878 pts/2 Z+ 0:00 [git-annex] <defunct>
14254 ? Z 0:00 [git-annex] <defunct>
14276 pts/2 Z+ 0:00 [git-annex] <defunct>
15932 ? Sl 0:00 git-annex transferkeys --readfd 37 --writefd 20
16022 pts/2 Sl 0:00 git-annex transferkeys --readfd 28 --writefd 22
16079 pts/2 S 0:00 git --git-dir=/mnt/debian/home/me/annex-backup/.git --work-tree=/mnt/debian/home/me/annex-backup cat-file --batch
16081 ? S 0:00 git --git-dir=/home/me/annex/.git --work-tree=/home/me/annex cat-file --batch
31565 pts/2 Sl+ 0:20 git-annex webapp
31580 pts/2 S+ 0:00 git --git-dir=/mnt/debian/home/me/annex-backup/.git --work-tree=/mnt/debian/home/me/annex-backup cat-file --batch
31590 pts/2 S+ 0:00 git --git-dir=/mnt/debian/home/me/annex-backup/.git --work-tree=/mnt/debian/home/me/annex-backup cat-file --batch
31618 pts/2 S+ 0:00 git --git-dir=/mnt/debian/home/me/annex-backup/.git --work-tree=/mnt/debian/home/me/annex-backup cat-file --batch
31635 ? Sl 9:26 /usr/lib/firefox/firefox /mnt/debian/home/me/annex-backup/.git/annex/webapp.html
31689 pts/2 SN+ 0:00 git --git-dir=/mnt/debian/home/me/annex-backup/.git --work-tree=/mnt/debian/home/me/annex-backup check-attr -z --stdin annex.backend annex.numcopies --
31812 pts/2 Z 0:00 [git-annex] <defunct>
31835 ? Ss 0:02 ssh: .git/annex/ssh/example.net [mux]
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.47"
subject="comment 1"
date="2013-11-03T00:50:48Z"
content="""
Run `git annex unannex` on the files.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.47"
subject="comment 3"
date="2013-11-03T00:19:34Z"
content="""
I'd be happy to put in some icons if someone finds some good (and suitably licensed) ones that cover the different types of repositories.
"""]]