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

This commit is contained in:
Joey Hess 2012-11-05 19:43:02 -04:00
commit e6581b4d9b
4 changed files with 43 additions and 0 deletions

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlJEI45rGczFAnuM7gRSj4C6s9AS9yPZDc"
nickname="Kevin"
subject="unlock not behaving as you describe"
date="2012-11-05T22:35:35Z"
content="""
@joeyh,
I'm not seeing the behavior you describe re \"git annex unlock\" when using the assistant. After unlocking and writing the file, git annex assistant commits the changes and recreates the symlink from under me which is annoying.
I'm running OS X 10.7.5 using the bundled git-annex.app version 3.20121017.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.27"
subject="comment 5"
date="2012-11-05T23:40:50Z"
content="""
Well, you're able to unlock and modify the file -- that's what I fixed.
Committing changes to files is what the assistant does..
"""]]

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://olg.myid.net/"
ip="93.218.131.119"
subject="comment 2"
date="2012-11-05T23:34:20Z"
content="""
Wow, thank you for implementing this so quickly!
Just one question: As far as I understood git-annex-shell relays all unknown commands to git-shell. In this case are there the same restrictions active, too?
Thanks again...
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.27"
subject="comment 3"
date="2012-11-05T23:42:10Z"
content="""
All commands usually run by `git-shell` have the repository directory as their last parameter, and git-annex-shell depends on that being the case and checks them. It's possible to add some commands to git-shell by putting them in a special directory, and if those commands don't take the directory last, they wouldn't work.
"""]]