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

This commit is contained in:
Joey Hess 2014-02-19 17:39:58 -04:00
commit 33f2ea61ff

View file

@ -0,0 +1,33 @@
### Please describe the problem.
'trust', 'dead', etc commands completing with 'ok' but fail to acknowledge contradiction in .git/config, causing confusion.
[[!format sh """
greg@x200s:~/Photos$ git-annex untrust home # yes, bad remote name
untrust home ok
(Recording state in git...)
greg@x200s:~/Photos$ git-annex status # /me is old-school and forgets
greg@x200s:~/Photos$ git-annex info
repository mode: indirect
trusted repositories: 2
c0e4106e-2631-11e2-9749-1bfa37a61069 -- rose
c69d6fcc-18d1-11e2-9487-2fe6dbf0516b -- home (photos on eeepc)
....
greg@x200s:~/Photos$ git-annex dead home
dead home ok
(Recording state in git...)
greg@x200s:~/Photos$ git-annex info
repository mode: indirect
trusted repositories: 2
c0e4106e-2631-11e2-9749-1bfa37a61069 -- rose
c69d6fcc-18d1-11e2-9487-2fe6dbf0516b -- home (photos on eeepc)
"""]]
The home remote has "annex-trustlevel=trusted" in .git/config
Maybe have those commands instead say "Hey, this is different than what you said explicitly in .git/config, ya sure? (y/n)" If y, overwrite config, if n, abort.
### What version of git-annex are you using? On what operating system?
5.20140127 on Debian