summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-29 20:12:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-29 20:17:05 -0400
commit339a924da09f243b17df249529a23ab000e36022 (patch)
treedd2d1d1b8ad64102ac63a01b49896f68aa23463e /Annex
parentfa93e60db454ab2c1b44c4ca48e093e166de9ad4 (diff)
webapp: When adding a new local repository, fix bug that caused its group and preferred content to be set in the current repository, even when not combining.
There was a tricky bit here, when it does combine, the edit form is shown, and so the info needs to be committed to the new repository, but then pulled into the current one. And caches need to be invalidated for it to be visible in the edit form.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 7a75d8acf..108f97b14 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -218,7 +218,7 @@ set = setJournalFile
commit :: String -> Annex ()
commit = whenM journalDirty . forceCommit
-{- Commits the current index to the branch even without any journalleda
+{- Commits the current index to the branch even without any journalled
- changes. -}
forceCommit :: String -> Annex ()
forceCommit message = lockJournal $ \jl -> do