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 2019-01-03 16:12:32 -04:00
commit 2b27717c20
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 182 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
doc/bugs/git-annex_addurl___38___CDN__58___curl_does_not_follow.mdwn Normal file
View file

@ -0,0 +1,43 @@
### Please describe the problem.
i try to load add a URL to git (for later download) which is behind a CDN.
> git-annex addurl https://cdn.media.ccc.de/congress/2018/h264-sd/35c3-9462-eng-deu-fra-What_The_Fax_sd.mp4
it tells me:
> addurl cdn.media.ccc.de_congress_2018_h264_sd_35c3_9462_eng_deu_fra_What_The_Fax_sd.mp4 (downloading https://cdn.media.ccc.de/congress/2018/h264-sd/35c3-9462-eng-deu-fra-What_The_Fax_sd.mp4 ...)
> Configuration does not allow accessing https://cdn.media.ccc.de/congress/2018/h264-sd/35c3-9462-eng-deu-fra-What_The_Fax_sd.mp4
failed
> git-annex: addurl: 1 failed
looking around, I find that curl itself does also not load the file. wget does out-of-the-box
hint: curl -L "--location" seems to work, as this follows the http 30x
--> how to fix this ?
### What steps will reproduce the problem?
examples on top
### What version of git-annex are you using? On what operating system?
debian stretch, x64. git-annex as out-of-box
> $ apt-show-versions | grep git-annex
> git-annex:amd64/stretch 6.20170101-1+deb9u2 uptodate
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]
### 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)
yes ! wunderful tool.
managing my video, photo & music with it.

10
doc/bugs/git-annex_addurl___38___CDN__58___curl_does_not_follow/comment_1_10ad677cc7b1d57c82dd46fb9849f835._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="CandyAngel"
avatar="http://cdn.libravatar.org/avatar/15c0aade8bec5bf004f939dd73cf9ed8"
subject="comment 1"
date="2019-01-03T12:29:41Z"
content="""
I think this might be from a security change that was introduced recently-ish: [[news/security_fix_release/]].
Perhaps the redirect is not in the whitelisted schemes (or you have no schemes whitelisted)?
"""]]

14
doc/bugs/git-annex_addurl___38___CDN__58___curl_does_not_follow/comment_2_d216b61f356f20245e3f65d574ef6749._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="ka7"
avatar="http://cdn.libravatar.org/avatar/653da3a21d59dd218e84be58bfa8ed4c"
subject="got it"
date="2019-01-03T14:10:19Z"
content="""
adding this to .git/config
[annex \"security\"]
allowed-url-schemes = http https
allowed-http-addresses = all
workend for me. YMMV
"""]]

17
doc/bugs/git-annex_addurl___38___CDN__58___curl_does_not_follow/comment_3_4544008749e6399d61c203d5b9ce1fff._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="ka7"
avatar="http://cdn.libravatar.org/avatar/653da3a21d59dd218e84be58bfa8ed4c"
subject="(better formating..)"
date="2019-01-03T14:15:21Z"
content="""
adding this to .git/config
>[annex \"security\"]
> allowed-url-schemes = http https
> allowed-http-addresses = all
workend for me. YMMV
"""]]

33
doc/forum/Move_history/comment_3_9ff881c26c3bd7f3a61595ffc1df743a._comment Normal file
View file

@ -0,0 +1,33 @@
[[!comment format=mdwn
username="andrew"
avatar="http://cdn.libravatar.org/avatar/acc0ece1eedf07dd9631e7d7d343c435"
subject="comment 3"
date="2019-01-03T01:32:28Z"
content="""
There are various ways to forget history, both in git and git-annex. I don't have enough clarity into what history is taking up space in your repository to give you a good answer. Answering the following questions will give me more insight into where the space is being used up, then I can give you some ideas on how to reclaim it:
Is the repo in question direct or indirect (I am not sure what you meant by \"direct mode network\")? Output of `git annex info | grep \"repository mode\"` command will tell you this.
What git-annex repo version is the repo in question? Output of `git annex version | grep \"local repository version\"` command will tell you this.
If you cd into the repo in question and run `git-annex info` it gives you various information about what git-annex thinks about the repository. One of the outputs of this command is \"local annex size\" which tells you how much space this repo is taking up. In a direct mode repo this should be the same size as you get from sizing all the files in your working directory excluding the .git directory (`du -sh --exclude=.git` on Linux). Otherwise in an indirect mode repo, the \"local annex size\" given by `git-annex info` should match the size of the `.git/annex/objects` directory.
If you cd into the repo in question what are the outputs of the following commands.
Size of git annex objects (In a direct mode repo this should be very small):
du -sh .git/annex/objects/
Size of git objects (This just tells you how much history is stored in git. This should also be small (unless you store a lot of large files in git, which you probably don't since you are using git-annex):
du -sh .git/objects/
Size of working tree (this will tell you file content present in this repo):
git annex info | grep \"size of annexed files in working tree\"
"""]]

28
doc/forum/Move_history/comment_4_d0c97744e9ccca21e4023f657e9f5f30._comment Normal file
View file

@ -0,0 +1,28 @@
[[!comment format=mdwn
username="Chymera"
avatar="http://cdn.libravatar.org/avatar/555d585d6d78c68894ac90fd1e984309"
subject="comment 4"
date="2019-01-03T19:33:01Z"
content="""
```
chymera@clusterhost ~/ni_data/ofM.dr $ git annex info | grep \"repository mode\"
repository mode: direct
chymera@clusterhost ~/ni_data/ofM.dr $ git annex version | grep \"local repository version\"
local repository version: 5
```
> One of the outputs of this command is \"local annex size\" which tells you how much space this repo is taking up.
this does not happen, `git-annex info | grep \"local annex size\"` returns nothing.
```
chymera@clusterhost ~/ni_data $ du -sh .git/annex/objects/
1.6G .git/annex/objects/
chymera@clusterhost ~/ni_data $ du -sh .git/objects/
218M .git/objects/
chymera@clusterhost ~/ni_data $ du -sh
779G
chymera@clusterhost ~/ni_data $ du -sh .git/
501G .git/
```
"""]]

20
doc/forum/Move_history/comment_6_0655707fe70710408b93b5f53f8d6f26._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="Chymera"
avatar="http://cdn.libravatar.org/avatar/555d585d6d78c68894ac90fd1e984309"
subject="comment 6"
date="2019-01-03T19:43:23Z"
content="""
chymera@clusterhost ~/ni_data/ofM.dr $ git annex info | grep \"repository mode\"
repository mode: direct
chymera@clusterhost ~/ni_data/ofM.dr $ git annex version | grep \"local repository version\"
local repository version: 5
chymera@clusterhost ~/ni_data $ du -sh .git/annex/objects/
1.6G .git/annex/objects/
chymera@clusterhost ~/ni_data $ du -sh .git/objects/
218M .git/objects/
chymera@clusterhost ~/ni_data $ du -sh
779G
chymera@clusterhost ~/ni_data $ du -sh .git/
501G .git/
"""]]

16
doc/tips/unlocked_files/comment_7_46ff6b142c4cc9ad07b0c8dc07ba9c09._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="colin.brosseau@d444b2b3412af38b85f7b4b340b9c44a412b5698"
nickname="colin.brosseau"
avatar="http://cdn.libravatar.org/avatar/23872b72fbb19f62ac611e9a80e27f29"
subject="NTFS Make it clear that it'll not work with annex.thin"
date="2019-01-03T18:04:58Z"
content="""
On the doc it's said that
\"Note that setting annex.thin only has any effect on systems that support hard links. It is supported on Windows, but not on FAT filesystems.\"
Having read that, I was thinking that I'd be able to use _annex.thin_ with NTFS but it doesn't work.
I'd specify clearly that NTFS would also not work with _annex.thin_
Thanks
"""]]

1
doc/todo/per-branch_git-annex_branch.mdwn Normal file
View file

@ -0,0 +1 @@
Currently, if I do some work on an experimental branch, creating some annexed files, then abandon the branch, information about keys created on the experimental branch will remain in the git-annex branch. This breaks git's normal notion of lightweight branching, where you can work on an experimental branch and, if you later decide to abandon that work, it'll be as if the experimental branch never existed. Maybe, it would make sense to have, for each branch mybranch, a corresponding branch git-annex-b/mybranch , which would hold the state of the git-annex branch reflecting work on mybranch? Then, if you decide to merge mybranch into master, git-annex-b/mybranch would get union-merged into the git-annex branch (or into git-annex-b/master). But if you decide to abandon/delete mybranch, git-annex-b/mybranch can be abandoned/deleted with no trace left in the main git-annex branch.