From 59eaca60b13a039dff3e918dd6cc7ae47196737b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Mar 2016 13:57:48 -0400 Subject: prevent git-annex adjust changing things out from under the daemon --- Command/Adjust.hs | 2 +- doc/design/adjusted_branches.mdwn | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Command/Adjust.hs b/Command/Adjust.hs index 3f3fd0d82..e2850a361 100644 --- a/Command/Adjust.hs +++ b/Command/Adjust.hs @@ -12,7 +12,7 @@ import Annex.AdjustedBranch import Annex.Version cmd :: Command -cmd = notBareRepo $ notDirect $ +cmd = notBareRepo $ notDirect $ noDaemonRunning $ command "adjust" SectionSetup "enter adjusted branch" paramNothing (seek <$$> optParser) diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index d718cd342..187617f67 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -299,7 +299,3 @@ into adjusted view worktrees.] ## TODOs * 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. -- cgit v1.2.3