mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

prevent git-annex adjust changing things out from under the daemon

Browse source
This commit is contained in:
Joey Hess 2016-03-29 13:57:48 -04:00
parent 8a69298bf2
commit 6301543c00
Failed to extract signature
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Adjust.hs
View file

@ -12,7 +12,7 @@ import Annex.AdjustedBranch
import Annex.Version import Annex.Version
cmd :: Command cmd :: Command
cmd = notBareRepo $ notDirect $ cmd = notBareRepo $ notDirect $ noDaemonRunning $
command "adjust" SectionSetup "enter adjusted branch" command "adjust" SectionSetup "enter adjusted branch"
paramNothing (seek <$$> optParser) paramNothing (seek <$$> optParser)

4
doc/design/adjusted_branches.mdwn
View file

@ -299,7 +299,3 @@ into adjusted view worktrees.]
## TODOs ## TODOs
* Interface in webapp to enable adjustments. * Interface in webapp to enable adjustments.
* Entering an adjusted branch can prevent commits to the current branch
(locking will cause the commits to fail) and so the assistant
should not be running, or at least should have commits disabled
when entering it.