Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-10-12 19:24:27 -04:00
commit e6d3ffb941
2 changed files with 30 additions and 0 deletions

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.54"
subject="comment 3"
date="2014-10-12T20:14:36Z"
content="""
Probably the same problem reported here:
<https://github.com/datalad/datalad/issues/12>
I guess this is a mismatch between the version of git that git-annex was built with and the version it's using. In particular, git check-attr behavior varies between git older than 1.7.7 and newer, and git-annex picks the version at build time.
So, I think this is a broken Ubuntu PPA, and if that's the current one, the maintainer of the PPA needs to be contacted to update the git-annex to match the git version, or depend on an appropriate git version.
"""]]

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="ghen1"
ip="66.41.70.34"
subject="comment 2"
date="2014-10-12T21:03:01Z"
content="""
The custom settings I had made before (the rest are still commented out):
trust a8372263-6eba-47e2-9604-3e2c9bbb6d42 = trusted
wanted 3e2bcb1e-39ad-4863-a9ce-a18a262644c1 = present or (not include=/Books/*)
wanted a8372263-6eba-47e2-9604-3e2c9bbb6d42 = present or include=/Books/*
I am trying to comment them out again.
Based on your answer, I guessed that these settings don't just reset to default when they are commented out, so I tried changing the above trusted setting to semitrusted, and sure enough it worked.
So it seems once these settings are made they can't be commented out again, and any invalid settings are ignored?
"""]]