Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
commit
8dd5e7d7a7
5 changed files with 40 additions and 0 deletions
|
@ -0,0 +1,6 @@
|
||||||
|
The assistant does not allow adding an existing repo: I tried to add a "remote server", to enter the credits, and then I add to choose between "git-annex" or "rsync". Choosing "git-annex" tries to create a new repo and then fails. The repo on the server is a bare one, accessed via gitolite. Setting the remote manually ("git remote add origin git@example.org:my-annex.git" works (I can pull, push, ...))
|
||||||
|
|
||||||
|
Mac OS 10.7 version 2013-09-10
|
||||||
|
|
||||||
|
|
||||||
|
[2013-09-13 17:00:55 CEST] chat: ssh ["-p","22","git@example.org","sh -c 'mkdir -p '\"'\"'my-annex.git'\"'\"'&&cd '\"'\"'my-annex.git'\"'\"'&&if [ ! -d .git ]; then git init --bare --shared; fi&&git annex init'"]
|
|
@ -0,0 +1,10 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="http://joeyh.name/"
|
||||||
|
ip="4.154.2.134"
|
||||||
|
subject="comment 2"
|
||||||
|
date="2013-09-13T17:04:26Z"
|
||||||
|
content="""
|
||||||
|
That is an unrelated bug. You got very lucky that I saw your followup comment.
|
||||||
|
|
||||||
|
I was able to reproduce it, and found bug in git annex fsck that prevented it from finding and fixing this problem on Windows. Am still investigating why the problem occurs in the first place..
|
||||||
|
"""]]
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="http://joeyh.name/"
|
||||||
|
ip="4.154.2.134"
|
||||||
|
subject="comment 3"
|
||||||
|
date="2013-09-13T17:44:04Z"
|
||||||
|
content="""
|
||||||
|
I have now diagnosed and fixed the underlying problem on Windows.
|
||||||
|
"""]]
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="http://joeyh.name/"
|
||||||
|
ip="4.154.2.134"
|
||||||
|
subject="comment 3"
|
||||||
|
date="2013-09-13T16:17:39Z"
|
||||||
|
content="""
|
||||||
|
Depending on your git configuration, `git annex sync` might not be updating certian of these branches, such as remotes/origin/HEAD. You can check the branches out and see which still contains your deleted files.
|
||||||
|
"""]]
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
|
||||||
|
nickname="Hamza"
|
||||||
|
subject="comment 4"
|
||||||
|
date="2013-09-13T17:57:38Z"
|
||||||
|
content="""
|
||||||
|
Which one of those branches I can safely delete? this is a central repo all other clients drop their stuff here it does not have any remotes (I did clones it from a client then removed origin section from config.)
|
||||||
|
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue