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-30 13:40:35 -04:00
commit 78921d0498
14 changed files with 434 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_1_414adc1bee73711e3133c7fe8811aae2._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkViAynw-AW5kjf3w_QDwCVwhPc3k7gY5E"
nickname="Thomas"
subject="I see the same fail"
date="2014-01-29T21:52:18Z"
content="""
I se the same failure at both my android devices:
Nexus 7, Android 4.4.2, git-annex 5.20140128 and
Xperia phone, Android 4.1.2, git-annex 5.20140108
"""]]

10
doc/bugs/File_that_are_in_two_place_can_be_sequentially_copy_then_dropped.mdwn Normal file
View file

@ -0,0 +1,10 @@
### Please describe the problem.
I've a repository with a prefered content of "exclude=cours/vieux/* and ( include=cours/* or include=Programmes/* or include=Stage/* )", but there is a repository that has a (identical) copy both in cours/vieux and in Stage/ so git annex sync --content will
- get the content in Stage/
- then drop it because it is in cours/vieux/
And again, and again...
### What version of git-annex are you using? On what operating system?
git-annex 5.20140127 in debian/sid

11
doc/bugs/Jabber__47__xmpp_not_supported_on_Debian_Wheezy_backport.mdwn Normal file
View file

@ -0,0 +1,11 @@
### Please describe the problem.
I've installed Git-annex via the backport, everything looks fine. But when I go to Configuration>Configure jabber account I've got this message :
[[!format sh """
Jabber not supported
This build of git-annex does not support Jabber. Sorry !
"""]]
### What version of git-annex are you using? On what operating system?
5.20140117~bpo70+1 and Debian Wheezy with lxde

8
doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__/comment_6_9cb32f198eee25b7175cc9ad1795acb3._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.199"
subject="comment 6"
date="2014-01-29T21:24:34Z"
content="""
I missed that moveFile refuses to overwrite existing files. This is fixed in git, and the autobuild is updating.
"""]]

174
doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__/comment_7_f8a70156d56c4be6cfbadb50e8a08285._comment Normal file
View file

@ -0,0 +1,174 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
nickname="Justin"
subject="comment 7"
date="2014-01-30T16:02:08Z"
content="""
Alright, I've grabbed the latest autobuild and have tested again with 5.20140130-gcb99900. Back to failing just this one test case. Compared to my last two comments, the test appears to be getting further along before failing.
conflict_resolution (mixed directory and file): Detected a filesystem without fifo support.
Disabling ssh connection caching.
Detected a crippled filesystem.
Enabling direct mode.
Detected a filesystem without fifo support.
Disabling ssh connection caching.
Detected a crippled filesystem.
Enabling direct mode.
add conflictor ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
ok
push origin
Counting objects: 21, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (16/16), 1.66 KiB | 0 bytes/s, done.
Total 16 (delta 1), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
dafdb0b..2d106aa git-annex -> synced/git-annex
688224a..18c2edb annex/direct/master -> synced/master
ok
add conflictor/subfile ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
remote: Counting objects: 21, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 16 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (16/16), done.
From c:/Users/geibeljt/annex/.t\repo
688224a..18c2edb master -> origin/master
dafdb0b..2d106aa synced/git-annex -> origin/synced/git-annex
688224a..18c2edb synced/master -> origin/synced/master
Adding conflictor/subfile
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~
refs_remotes_origin_synced_master
Automatic merge failed; fix conflicts and then commit the result.
(Recording state in git...)
conflictor: needs merge
[annex/direct/master 5026450] git-annex automatic merge conflict fix
Merge conflict was automatically resolved; you may want to examine the result.
ok
(merging origin/synced/git-annex into git-annex...)
(Recording state in git...)
push origin
Counting objects: 32, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (19/19), done.
Writing objects: 100% (23/23), 2.18 KiB | 0 bytes/s, done.
Total 23 (delta 7), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
2d106aa..aca0d04 git-annex -> synced/git-annex
18c2edb..5026450 annex/direct/master -> synced/master
ok
commit ok
pull r2
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 23 (delta 7), reused 0 (delta 0)
Unpacking objects: 100% (23/23), done.
From ../../.t\tmprepo36
* [new branch] annex/direct/master -> r2/annex/direct/master
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
Updating 18c2edb..5026450
Fast-forward
conflictor | 1 -
conflictor.variant-cc12 | 1 +
conflictor/subfile | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
delete mode 120000 conflictor
create mode 120000 conflictor.variant-cc12
create mode 120000 conflictor/subfile
Already up-to-date.
ok
(merging r2/git-annex into git-annex...)
Detected a filesystem without fifo support.
Disabling ssh connection caching.
Detected a crippled filesystem.
Enabling direct mode.
Detected a filesystem without fifo support.
Disabling ssh connection caching.
Detected a crippled filesystem.
Enabling direct mode.
add conflictor ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
Adding conflictor/subfile
CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/origin/synced/master. Add
ing conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
conflictor: needs merge
(Recording state in git...)
[annex/direct/master 82abd2f] git-annex automatic merge conflict fix
Merge conflict was automatically resolved; you may want to examine the result.
ok
push origin
Counting objects: 32, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (17/17), done.
Writing objects: 100% (22/22), 1.95 KiB | 0 bytes/s, done.
Total 22 (delta 7), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
aca0d04..9d475c9 git-annex -> synced/git-annex
5026450..82abd2f annex/direct/master -> synced/master
ok
add conflictor/subfile ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 22 (delta 7), reused 0 (delta 0)
Unpacking objects: 100% (22/22), done.
From c:/Users/geibeljt/annex/.t\repo
5026450..82abd2f master -> origin/master
aca0d04..9d475c9 synced/git-annex -> origin/synced/git-annex
5026450..82abd2f synced/master -> origin/synced/master
Auto-merging conflictor/subfile
CONFLICT (add/add): Merge conflict in conflictor/subfile
Automatic merge failed; fix conflicts and then commit the result.
failed
(merging origin/synced/git-annex into git-annex...)
(Recording state in git...)
push origin
Counting objects: 34, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (17/17), done.
Writing objects: 100% (22/22), 2.05 KiB | 0 bytes/s, done.
Total 22 (delta 5), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
9d475c9..13a0faa git-annex -> synced/git-annex
! [rejected] annex/direct/master -> synced/master (non-fast-forward)
error: failed to push some refs to 'c:/Users/geibeljt/annex/.t\repo'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Pushing to origin failed.
(non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git
config)
failed
git-annex: sync: 2 failed
FAIL
"""]]

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

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
ip="2001:1928:1:9::1"
subject="comment 17"
date="2014-01-30T04:57:24Z"
content="""
@joeyh - any other ideas? I still can't really use the assistant...
"""]]

71
doc/bugs/detected_bad_bare_repository_with___60__SCREECH__62___files.mdwn Normal file
View file

@ -0,0 +1,71 @@
### Please describe the problem.
Fun one: I have a backup repository created with the assistant. For some reason it's a bare repository, not sure why. It makes my hard drive scream with pain.
### What steps will reproduce the problem?
When I tried `git annex copy --to backup`, I saw this:
[[!format sh """
[2014-01-29 23:46:03 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","git-annex"]
[2014-01-29 23:46:04 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","--hash","refs/heads/g
[2014-01-29 23:46:11 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..ac42
[2014-01-29 23:46:12 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..9ab4
[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..5795
[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..8006
[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..320e
[2014-01-29 23:46:22 EST] chat: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","cat-file","--batch"]
[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
[2014-01-29 23:46:22 EST] call: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3/.git","--work-tree=/med
[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
[2014-01-29 23:46:22 EST] Detected bad bare repository with
"""]]
Then this stopped and my hard drive started scratching. It makes this horrible screeching sound because it's quite old, hence the bug title.
It seems that this debug message tries to list all the objects in the filesystem, which in this case is quite large:
[[!format haskell """
fixBadBare :: Annex ()
fixBadBare = whenM checkBadBare $ do
ks <- getKeysPresent
liftIO $ debugM "Init" $ unwords
[ "Detected bad bare repository with"
, show (length ks)
, "objects; fixing"
]
"""]]
Maybe this could be skipped? It takes forever (7 minutes) to compute that length (21353 objects)...
### What version of git-annex are you using? On what operating system?
5.20140102-gd93f946, provided by joeyh as part of [[bugs/assistant_eats_all_CPU/]].
### Please provide any additional information below.
Here's the complete transcript of that copy:
[[!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
[2014-01-29 23:46:03 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","git-annex"]
[2014-01-29 23:46:04 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","--hash","refs/heads/g
[2014-01-29 23:46:11 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..ac42
[2014-01-29 23:46:12 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..9ab4
[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..5795
[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..8006
[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..320e
[2014-01-29 23:46:22 EST] chat: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","cat-file","--batch"]
[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
[2014-01-29 23:46:22 EST] call: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3/.git","--work-tree=/med
[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
[2014-01-29 23:46:22 EST] Detected bad bare repository with 21353 objects; fixing
[2014-01-29 23:53:06 EST] call: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3","config","core.bare","true"]
[2014-01-29 23:53:06 EST] read: git ["config","--null","--list"]
[2014-01-29 23:53:06 EST] chat: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3","cat-file","--batch"]
[2014-01-29 23:57:22 EST] call: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","config","remote..annex-uuid","c32322fa-8873-4635-8d4c-1dc27977eb6f"]
[2014-01-29 23:57:22 EST] read: git ["config","--null","--list"]
# End of transcript or log.
"""]]

47
doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup.mdwn Normal file
View file

@ -0,0 +1,47 @@
Hi.
trying to manage my collection of digital music files using git-annex. The collection (113 gigs of flac files ripped from my CDs) should be stored on my three different machines and updated on all of them, if I add or change a file on only one of the machines.
### Please describe the problem.
Added a new external USB disk for sneaker transfer via web app, yesterday.
Now for no apparent reason, after startup/login, git-annex would start and quickly suck up all available RAM. This is on a fairly well equipped machine (16G physical RAM, i5-2400), yet "top" tells me that there is one git process that sucks up more than 20G and climbing. It looked like this:
git --git-dir=/home/user/Sync/Audio/.git --work-tree=/home/user/Sync/Audio -c core.bare=false log refs/heads git-annex..13d365f16ffdb5a393f66362b840d3f21bb4c59c --oneline -n1
The computer then slows down, grinds to halt, becomes unresponsive and it's difficult to even login on the console.
Then, the OOM killer kicks in and kicks the git process, but git-annex quickly starts another which does the same.
### What steps will reproduce the problem?
I don't know what caused it. The symptoms remained after a reboot, "git annex watch --stop" didn't help either, since I'm a dumb web app user, I'm not sure if that's the right command to use anyway.
For now, I have removed git-annex from the system.
### What version of git-annex are you using? On what operating system?
Last installed version: git-annex 5.20140127.1 on Ubuntu 13.10, amd64.
### Please provide any additional information below.
I'm fairly unsure where to look for the cause and what logs to provide you with to help fix this. Just guessing that it could be a symptom, but the daemon.log is full of entries like this:
[[!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
("race detected",ca2cbdb84bcbd4aab895284b16fc72f693fbba90,[4a2e7c1d7d286a4da9e816b20368ce2f9b4177c4],"committing",(ca2cbdb84bcbd4aab895284b16fc72f693fbba90,[ca2cbdb84bcbd4aab895284b16fc72f693fbba90]))
(Recording state in git...)
("race detected",28c835634e65ced0e532c1a0e4f34dd0344193bc,[19597be0f49fb859fafa51e006459d5a95e3d005],"committing",(28c835634e65ced0e532c1a0e4f34dd0344193bc,[28c835634e65ced0e532c1a0e4f34dd0344193bc]))
(Recording state in git...)
("race detected",1f2b06c7001be38bd9595eb2205c91454597edaa,[398660279436246a698d6bd55eb06998999ed64f],"committing",(1f2b06c7001be38bd9595eb2205c91454597edaa,[1f2b06c7001be38bd9595eb2205c91454597edaa]))
(Recording state in git...)
("race detected",4c1510c3db41ff400526d5753c03bddc48f5c37e,[1989177cf24ec9151058ed99f05117e48c239001],"committing",(4c1510c3db41ff400526d5753c03bddc48f5c37e,[4c1510c3db41ff400526d5753c03bddc48f5c37e]))
(Recording state in git...)
("race detected",b82f41fcbf24c43fe9f1f9d6fb54ba5ef9ff8de0,[799e4434447b18be63bd097120e1fbf56eac48ce],"committing",(b82f41fcbf24c43fe9f1f9d6fb54ba5ef9ff8de0,[b82f41fcbf24c43fe9f1f9d6fb54ba5ef9ff8de0]))
(Recording state in git...)
# End of transcript or log.
"""]]

14
doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_1_b550f292359b44977481bf69abad4012._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkVnM7Ol2kr_jfLg6h_oXpmNdxWHIiL9mk"
nickname="Hanno"
subject="comment 1"
date="2014-01-30T11:18:15Z"
content="""
In case it helps:
$ grep \"race detected\" daemon.log.5 | wc -l
234986
"""]]

8
doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_2_76e6c1d4db27bcc1767ba34e13e8211c._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.199"
subject="comment 2"
date="2014-01-30T17:39:47Z"
content="""
How many files are in the repository?
"""]]

10
doc/devblog/day_104__unused_II/comment_6_0ed4023c9c249024fe0454fc5bab3b14._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm7AuSfii_tCkLyspL6Mr0ATlO6OxLNYOo"
nickname="Georg"
subject="comment 6"
date="2014-01-30T10:52:09Z"
content="""
Well, according to the hackage documentation of http conduit it seems it at least supports proxies when youre code gives it the proxy host and port.
But the link about the problem with environment settings helped me to get around my immediate problem by just running annex from the git bash (which is prefereably to me most of the time anyway). So I could set up my annex on my work machine and just tunnel out with ProxyCommand via our ssh gateway. Yay!
"""]]

10
doc/forum/Can_Not_Sync_to_Git_Repo/comment_12_b4f8be428a08db01dbd004e1f06dcffd._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://cstork.org/"
nickname="Chris Stork"
subject="Bug fix confirmed"
date="2014-01-30T15:29:56Z"
content="""
Thank you, Joey!
FYI, my repo was automatically converted to version 5 and put on the annex/direct/master branch.
As Joey mentioned, this might only apply to my bug.
"""]]

40
doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__.mdwn Normal file
View file

@ -0,0 +1,40 @@
I have one Annex meant to be kept in sync across two computers by the assistant. These computers can't connect directly, so I use a transfer repository (at rsync.net) and xmpp. Recently the two repositories have started to diverge: files added here do not appear there and vice versa, files modified here are not updated there and vice versa. It may be related to this bug: [[bugs/Jabber__47__xmpp_not_supported_on_Debian_Wheezy_backport/]] since one of the two installed versions of git-annex is 5.20140117~bpo70+1, but I do not know whether the divergence started the day I upgraded to this version.
I tried this:
git-annex fsck --from rsync.net_annex
on both machines. No error is reported, but files are missing here and there and files differ here and there.
I stopped the assistant on both machines and tried to sync with:
git-annex sync
and got:
commit
ok
pull 'XXX'
fatal: Unable to find remote helper for 'xmpp'
failed
push 'XXX'
Pushing to XXX failed
(non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config)
failed
git-annex: sync: 2 failed
where 'XXX' stands for my jabber account. I then tried:
git-annex sync rsync.net_annex
but got:
git-annex: cannot sync special remotes: rsync.net_annex
This situation is unfortunate because the user is not made aware of anything failing. The assistant is running, the webapp shows files being uploaded to the transfer repository, but the two repositories are actually diverging.
How can I synchronize these two repositories?
Thanks,

13
doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__/comment_1_1c913395f076ee203caaab057da8afbe._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
nickname="maurizio"
subject="downgrading is not an easy option"
date="2014-01-30T05:44:48Z"
content="""
In order to check whether this is related to [[https://git-annex.branchable.com/bugs/Jabber__47__xmpp_not_supported_on_Debian_Wheezy_backport/]] I tried to downgrade git-annex to the previous version that was available on wheezy-backports (git-annex_4.20131106~bpo70+1_i386.deb) but then I get:
git-annex: Repository version 5 is not supported. Upgrade git-annex.
failed
"""]]