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-11-06 14:40:43 -04:00
commit 0cdae2143a
4 changed files with 53 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
doc/preferred_content/comment_11_4599023aa31ac3767a9c57b91b500f8d._comment → doc/bugs/Assistant_drops_files_from_remote_repos_that_it_shouldn__39__t.mdwn
View file

@ -1,10 +1,9 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnDx6KWBl4PpP7qikNB7rp0hK_UvwQq_L0"
nickname="Александр"
subject="Dropping files from remotes"
date="2014-11-05T16:09:54Z"
content="""
I think I found a bug where git-annex assistant starts to drop files in remote repos when it shouldn't. It can be easily reproduced with latest version in Debian Jessy (5.20141024) like this:
### Please describe the problem.
git-annex assistant starts to drop files in remote repos, even when they are set to manual.
### What steps will reproduce the problem?
Create 3 repos:
@ -12,7 +11,7 @@ Create 3 repos:
* m1 -- standard, manual
* m2 -- standard, manual
System has 3 files annexed: file1, file2, file3. Repo \"A\" has all three files, m1 has none, m2 has file3.
System has 3 files annexed: file1, file2, file3. Repo "A" has all three files, m1 has none, m2 has file3.
So, while in m1:
@ -32,4 +31,7 @@ So when 'file3' is present in local repo, it's not going to be dropped from m2.
I guess that rule 'present' works in local repo context while 'drop' acts on remote files.
"""]]
### What version of git-annex are you using? On what operating system?
I'm using latest version in Debian Jessie (5.20141024) on amd64 and armhf. I've also reproduced the bug with manually compiled 5.20141105-g8d8b248 on amd64.

16
doc/forum/Using_git-annex/comment_2_bf5e13a490e16943acd2732f093695fc._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawktbkKjilg70XC9XBFpIgVhtfLYH-0UMHY"
nickname="Tad"
subject="comment 2"
date="2014-11-06T15:39:12Z"
content="""
Ok so when I create my origin and after I add files to it, when I run git annex sync I get
Invalid command: 'git-annex-shell 'configlist' '/~/gitfile.git''
You appear to be using ssh to clone a git:// URL.
Make sure your core.gitProxy config option and the
GIT_PROXY_COMMAND environment variable are NOT set.
warning: no common commits
and then it hangs. Is git-annex not accepting git via ssh?
"""]]

8
doc/news/version_5.20141125/comment_1_206f701fd80c5272e3e5627ec5621aab._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
nickname="Carl"
subject="comment 1"
date="2014-11-05T20:41:37Z"
content="""
It is a slightly peculiar version number, is it not?
"""]]

18
doc/special_remotes/webdav/comment_14_45e3b7094d0611b2e082be352f74151a._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="https://olivier.mehani.name/"
nickname="olivier-mehani"
subject="comment 14"
date="2014-11-05T22:57:21Z"
content="""
I have a similar problem to Maarten's, with some potential differences:
* The WebDAV server is actually an ownCloud 7 instance;
* The WebDAV server's SSL cert is issued by CAcert (whose root keys are otherwise installed on my system);
* The cetificate lists the WebDAV VHost's name as an Subject Alt Name rather than its Common Name.
$ WEBDAV_USERNAME=shtrom WEBDAV_PASSWORD=correcthorsebatterystaple git annex initremote owncloud type=webdav url=https://owncloud/remote.php/webdav/annexdav chunk=10mb encryption=none
initremote owncloud (testing WebDAV server...)
git-annex: WebDAV failed to write file: TlsException (HandshakeFailed (Error_Protocol (\"certificate rejected: [NameMismatch \\"owncloud\\"]\",True,CertificateUnknown))): user error
failed
git-annex: initremote: 1 failed
"""]]