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-01-18 12:01:40 -04:00
commit babd03d252
11 changed files with 254 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

31
doc/bugs/--json_is_broken_for_status.mdwn Normal file
View file

@ -0,0 +1,31 @@
### Please describe the problem.
bad json produced
### What steps will reproduce the problem?
[[!format sh """
$> git annex status --json
,"success":true}
in another one
$> git annex status --json
D hardware/g-box/builds/mine/.#yoh-debug-lastdidnotconnect.txt
,"success":true}
"""]]
### What version of git-annex are you using? On what operating system?
Debian sid 5.20140116
### 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.
"""]]

8
doc/bugs/Auto_update_not_updating_to_newest_version/comment_4_2705fbfd74652ab097ac48ec687517c7._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.43"
subject="comment 4"
date="2014-01-17T19:36:39Z"
content="""
Well that upgrade did seem to succeed. The log almost looks like 2 git-annex assistant processes were running (which should not happen), it seems to have downloaded the upgrade twice somehow.
"""]]

8
doc/bugs/assistant_eats_all_CPU/comment_16_16382708d1683a7a9eaaf953f3cdb735._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.43"
subject="comment 16"
date="2014-01-17T19:07:10Z"
content="""
This bug is about cpu usage when git-annex assistant should be sitting idle, not about the statup scan.
"""]]

75
doc/bugs/can__39__t_get.mdwn Normal file
View file

@ -0,0 +1,75 @@
### Please describe the problem.
### What steps will reproduce the problem?
[[!format sh """
$> git annex get 2read/ISNN2010__Tang.pdf
git-annex: Cannot mix --all or --unused with file names.
"""]]
### What version of git-annex are you using? On what operating system?
[[!format sh """
$> apt-cache policy git-annex
git-annex:
Installed: 5.20140116
Candidate: 5.20140116
Version table:
*** 5.20140116 0
600 http://debian.lcs.mit.edu/debian/ sid/main amd64 Packages
100 /var/lib/dpkg/status
"""]]
### 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
$> git annex get 2read/ISNN2010__Tang.pdf
git-annex: Cannot mix --all or --unused with file names.
but seems to start fetching some load if I do not specify any path and just run 'git annex get'.
There seems to be some screw up:
I have plenty of objects under .git/annex/objects/ (seems largely from
the directory above), nothing is now reported by unused (with obscure
msg):
$> du -scmL * 2>/dev/null | tail -1
1 total
$> du -scm .git/annex/objects
334 .git/annex/objects
334 total
$> git annex dropunused all
git-annex: Map.findMin: empty map has no minimal element
Here is some portion of the history which lead to such a state (there
was git annex unused somewhere before)
25954 git annex move --unused --to onerussian.com_annex
25955 git annex dropunused
25956 git annex dropunused all
25962 git annex unused
25963 git log --stat -SSHA256E-s5639442--67691e57cb4d6c51afe838590ad265ba4bea9c291cf52d58ed24f05b70bf33bf.mp3
25965 git log --stat -SSHA256E-s143042--b4012bf03ed0a387a9e714390efa75f1dd769162cca4c9b77e516732342be3f9.html
25968 git annex move --unused --to onerussian.com_annex
25969 git annex dropunused all
25976 git annex unused
25978 git br
25980 git log --stat -Ss741707--7c215090893f1f0c994e2a9ad3088016676464bbad26768841dd08c07295a2fe.pdf.map
25981 git annex unused
25982 git annex fsck
25983 git annex unused
25984 git annex dropkey
25985 git log --stat -SSHA256E-s14534131--20de680eedb3e1fb687c9b00c154d978333b61f4ea122c632bdb5bcdbb1553ff.pdf
25986 git show de3ccae8304efbae4a7a8add49de638f64b821fc
25991 git annex fsck
# End of transcript or log.
"""]]

27
doc/bugs/can__39__t_get/comment_1_ef32287828481c161bd913c9db9052a5._comment Normal file
View file

@ -0,0 +1,27 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
nickname="Yaroslav"
subject="git annex fix starts fixing but then spits bulk of errors"
date="2014-01-18T05:42:15Z"
content="""
probably related:
```
fix books/Мои первые книжки/PDF/Благинина Е.А. - Лодочки (Мои первые книжки) - 1962.pdf ok
fix books/Мои первые книжки/PDF/Благинина Е.А. - Не мешайте мне трудиться (Мои первые книжки) - 1975.pdf fatal: This operation must be run in a work tree
ok
(Recording state in git...)
git-annex: user error (xargs [\"-0\",\"git\",\"--git-dir=/home/yoh/annex/.git\",\"add\",\"--force\",\"--\"] exited 123)
fatal: This operation must be run in a work tree
failed
(Recording state in git...)
git-annex: user error (xargs [\"-0\",\"git\",\"--git-dir=/home/yoh/annex/.git\",\"add\",\"--force\",\"--\"] exited 123)
fatal: This operation must be run in a work tree
failed
(Recording state in git...)
....
```
"""]]

32
doc/bugs/can__39__t_get/comment_2_31fe400f4bac516a5c1101612cb06a54._comment Normal file
View file

@ -0,0 +1,32 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
nickname="Yaroslav"
subject="repair seems to be also confused"
date="2014-01-18T05:47:02Z"
content="""
[[[
$> git annex repair
Running git fsck ...
No problems found.
fatal: '/home/yoh/annex/.git' is outside repository
Had to delete the .git/annex/index file as it was corrupt.
No data was lost.
ok
$> ls
2enjoy/ 2read/ 2watch/ books/ hardware/ videos/
2listen/ 2review/ abooks/ docs/ pics/
$> git annex repair
Running git fsck ...
No problems found.
fatal: '/home/yoh/annex/.git' is outside repository
Had to delete the .git/annex/index file as it was corrupt.
No data was lost.
ok
$> git annex get 2read/ISNN2010__Tang.pdf
git-annex: Cannot mix --all or --unused with file names.
]]]
"""]]

16
doc/bugs/can__39__t_get/comment_3_87d123c04815d38abb92f967829c3a23._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
nickname="Yaroslav"
subject="could it be part/reason of the problem"
date="2014-01-18T06:05:50Z"
content="""
not sure how that happened... definitely not me consciously! ;-) some commands are complaining that \"You cannot run this command in a bare repository\" which I thought is BS since it is not BARE! but then looked into .git/config and it does have core.bare = True ... yikes!..
This repository is also under assistant \"control\".
changing to bare=False seems to start 'get'ing things, git annex repair doesn't produce obscure errors.
git annex fix though now doesn't report any problems -- only 'ok', but none of those files mentioned 'ok' has a working symlink,,, but I guess that is a fluke after many upgrades -- just dropping everything locally and getting needed context after purging .git/annex/objects .
So I guess issue is resolved by discovering that repository was set to 'bare' mode somehow although it was not and seemed like working but not quite
"""]]

14
doc/bugs/can__39__t_get/comment_4_b99cff87dbe38f08f888200dfe7e2436._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.43"
subject="comment 4"
date="2014-01-18T15:42:59Z"
content="""
git-annex sets core.bare=true for direct mode, but it also then sets annex.direct=true and so does not treat it as a bare mode repository. If you had eg, manually tried to change annex.direct to false, and left it in bare mode, that would explain everything.
> git annex fix though now doesn't report any problems -- only 'ok', but none of those files mentioned 'ok' has a working symlink
That is completely normal behavior; git annex fix does not care if the content is locally present or not; it just checks that the symlinks would point to it if it were present.
(Fixed the partial function in dropunused.)
"""]]

10
doc/design/assistant/blog/day_45__long_polling/comment_5_b3e41ba77f21e93a4e086483793bf5ce._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmz8d2M0lQDYWLSbDQSjYRHfrQkWKgPu60"
nickname="Alex"
subject="re: long polling"
date="2014-01-17T20:27:23Z"
content="""
After poking through git-annex, I had the same realization. I hadn't realized that Yesod (or perhaps more accurately, Warp) is asynchronous above the Application level. I had feared I'd need to write some WAI middleware to accommodate the blocking nature of long polling requests. In retrospect it seems kind of silly: what kind of high-performance webserver doesn't handle requests concurrently?
I do still think there's a pattern worth encapsulating, even if it won't be long until WebSockets and SSE are widespread enough to be developed against without fallbacks.
"""]]

12
doc/tips/setup_a_public_repository_on_a_web_site/comment_3_a6698218f15c598c9b32e0af850133bf._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnRRUUZo3W7pAoRoST8P_l0PtUBhvYuzDg"
nickname="Lyle"
subject="web storage"
date="2014-01-17T22:59:27Z"
content="""
Is there a low cost web hosting solution that would support a public git-annex repo relatively simply with simple access to download the public files.
I figure I could set up an Amazon EC2 micro instance and mount an s3 share, hosting the git-annex remote, but this is a lot of overhead for something that dropbox does with 1 click \"share dropbox link\"?
Any suggestions would be great!
"""]]

21
doc/tips/using_gitolite_with_git-annex/comment_18_f1a180d5cf65b7a870a13ddb4f76d00d._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawll4Kgp7nMuOKdB0FfbcYZ3KRq7HCS0Slc"
nickname="Laura"
subject="Using Gitolite 3.2"
date="2014-01-17T20:14:16Z"
content="""
Adding:
'git-annex-shell' =>1,
To the .gitolite.rc file resulted in the \"FATAL: suspicous characters loitering about 'git-annex-shell 'configlist' '/~/testing''...
Gitolite source code (https://github.com/sitaramc/gitolite/commit/b1d3c0571409b7c6279fc6a77253c3bc262ab425#diff-79a3701e9e2cee0ea1316451c21a3fec) requires this entry:
'git-annex-shell ua'
"""]]