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 2018-07-31 12:15:40 -04:00
commit 1456d4e344
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 126 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/assistant/local_pairing_walkthrough/comment_9_bf313e490076a4676a632e3ec6129189._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="lhunath@3b4ff15f4600f3276d1776a490b734fca0f5c245"
nickname="lhunath"
avatar="http://cdn.libravatar.org/avatar/6388e539b56b3875cc9aceb9f404b3ad"
subject="Diagnosing local pairing issues."
date="2018-07-30T18:54:56Z"
content="""
In my situation, a local pairing is initiated on machine A, machine B sees the request, prompts for the pass-phrase, both machines proceed with the actual sync process, but nothing actually happens. The last message in B's log is \"Pairing with [A] in progress\" and machine A says \"main: Pairing in progress\". How do I diagnose this issue?
"""]]

52
doc/bugs/git-annex-export_treeish_subdir_path_does_not_exist__91____91__done__93____93__.mdwn Normal file
View file

@ -0,0 +1,52 @@
### Please describe the problem.
When exporting a treeish with a subdir to a dir special remote, it fails with the error:
[[!format sh """
git annex export master:subdir --to exportdir
fatal: Path 'subdir:' does not exist (neither on disk nor in the index).
git-annex: unknown tree
"""]]
I tried other treeish variations such as :./subdir, master:subdir but it didn't work either.
What is very strange to me is the ':' appended at the end of the path in the error.
Any idea what is going on here ?
### What steps will reproduce the problem?
[[!format sh """
mkdir annex
mv annex
git init annex
git annex init --version=6
touch a.txt
mkdir subdir
touch subdir/b.txt
git commit -m "initial commit"
mkdir ../exportdir
git annex initremote exportdir type=directory directory=../exportdir/ encryption=none exporttree=yes
git annex export master:subdir --to exportdir
fatal: Path 'subdir:' does not exist (neither on disk nor in the index).
git-annex: unknown tree
"""]]
### What version of git-annex are you using? On what operating system?
[[!format sh """
git annex version
git-annex version: 6.20171003
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify ConcurrentOutput TorrentParser MagicMime Feeds Quvi
dependency versions: aws-0.13.0 bloomfilter-2.0.1.0 cryptonite-0.10 DAV-1.2 feed-0.3.10.4 ghc-7.10.3 http-client-0.4.26.2 persistent-sqlite-2.2 torrent-10000.0.0 uuid-1.3.11 yesod-1.4.2
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: 6
supported repository versions: 3 5 6
upgrade supported from repository versions: 0 1 2 3 4 5
operating system: linux x86_64
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yep, it has been a long time since I used it but I am back to see what I can do to manage my files properly :)

11
doc/bugs/git-annex-export_treeish_subdir_path_does_not_exist__91____91__done__93____93__/comment_1_ef090d1e29d1724aa1751b6cf874c537._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="webanck"
avatar="http://cdn.libravatar.org/avatar/cd273f76ef8c4218510b4f50ef7e1f3d"
subject="comment 1"
date="2018-07-31T12:41:44Z"
content="""
Well, I can answer myself now.
It wasn't working because my version of git was too old.
I updated to version 2.18.0 and it works very well now !
It might be a good idea to find and specify the minimal git version needed to make this work next in the man page of git annex export for instance ;)
"""]]

11
doc/forum/Why_are_new_repos_v5__63___Should_I_be_concerned__63__/comment_1_b7fc905780f941314c99b94a87e0438a._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="RonnyPfannschmidt"
avatar="http://cdn.libravatar.org/avatar/c5379a3fe2188b7571858c49f9db63c6"
subject="comment 1"
date="2018-07-30T21:09:11Z"
content="""
as per [[upgrades/#index1h2]] the upgrade to v6 repos is currently manual due to the finer details of git smudge handling and direct mode vs lock/unlock
since v6 repos do behave differently the updates are manual
"""]]

2
doc/related_software.mdwn
View file

@ -53,4 +53,6 @@ designed to interoperate with it.
* [recastex](http://git-annex.branchable.com/tips/Announcing_recastex_-___40__re__41__podcast__from_your_annex/)
publishes podcasts and other files from by git-annex to your phone.
* [AnnexRemote](https://github.com/Lykos153/AnnexRemote) is a python library for creating new external special remotes.
See also [[not]] for software that is *not* related to git-annex, but similar.

2
doc/special_remotes/external.mdwn
View file

@ -28,4 +28,6 @@ Here's a simple shell script example, which can easily be adapted
to run whatever commands you need. Or better, re-written in some better
language of your choice.
For Python, there is a [library](https://github.com/Lykos153/AnnexRemote) that takes care of all the protocol details.
[[!inline pages="special_remotes/external/example.sh" feeds=no]]

25
doc/todo/be_able_to_specify_custom_commit_message_for_git-annex_branch_commit/comment_2_41a25215d9a1f635573d5e5f5c30fd62._comment Normal file
View file

@ -0,0 +1,25 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 2"
date="2018-07-31T14:27:17Z"
content="""
My usecase is to be able to associate changes in main branches and in git-annex branch, so instead of non-informative \"update\" commit message it could carry e.g.
[DATALAD] Updated git/annex from a remote location
URLs processed: 7
downloaded: 7
size: 17.1 GB
Files processed: 7
skipped: 7
overwritten: 7
or I might even include the branch in which changes were done, e.g. short ones become
[DATALAD, incoming] Updated git/annex from a remote location
[DATALAD, incoming-processed] Added files from extracted archives
...
Then looking at `git log git-annex` would allow me to quickly see what actions lead to \"updates\" in git-annex branch
"""]]

10
doc/todo/support_ssh__58____47____47___or_sftp__58____47____47___urls_via___34__built-in__34___ssh_support/comment_2_048a8f7b52a0baf4c0abbae37de00257._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="size"
date="2018-07-31T14:19:15Z"
content="""
> to check the file size, and it's not clear how to do that with a sftp or ssh url
what do you mean? why something as simple as \"ssh host stat filepath\" wouldn't work? or it seems e.g. libssh2 provides file size information via sftp: https://curl.haxx.se/mail/lib-2011-01/0094.html
"""]]

8
doc/users/datalad.mdwn
View file

@ -2,22 +2,22 @@ TODOs for DataLad
=================
[[!inline pages="todo/* and !todo/done and !link(todo/done) and
(author(yoh) or author(mih) or author(ben))" sort=mtime feeds=no actions=yes archive=yes show=0]]
(author(yoh) or author(mih) or author(ben) or author(yarikoptic))" sort=mtime feeds=no actions=yes archive=yes show=0]]
Done
----
[[!inline pages="todo/* and !todo/done and link(todo/done) and
(author(yoh) or author(mih) or author(ben))" feeds=no actions=yes archive=yes show=0]]
(author(yoh) or author(mih) or author(ben) or author(yarikoptic))" feeds=no actions=yes archive=yes show=0]]
My bugs
=======
[[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and
(author(yoh) or author(mih) or author(ben))" sort=mtime feeds=no actions=yes archive=yes show=0 template=buglist]]
(author(yoh) or author(mih) or author(ben) or author(yarikoptic))" sort=mtime feeds=no actions=yes archive=yes show=0 template=buglist]]
Fixed
-----
[[!inline pages="bugs/* and !bugs/done and link(bugs/done) and
(author(yoh) or author(mih) or author(ben))" feeds=no actions=yes archive=yes show=0 template=buglist]]
(author(yoh) or author(mih) or author(ben) or author(yarikoptic))" feeds=no actions=yes archive=yes show=0 template=buglist]]