revert recent bug fix temporarily for release
Decided this bug is not severe enough to delay the release until tomorrow, so this will be re-applied after the release.
This commit is contained in:
parent
c1ef4a7481
commit
16f1e24665
8 changed files with 33 additions and 42 deletions
|
@ -52,7 +52,7 @@ import Git.Sha
|
|||
import Git.CatFile
|
||||
import Git.Branch (writeTreeQuiet, update')
|
||||
import qualified Git.Ref
|
||||
import Config
|
||||
import qualified Git.Config
|
||||
import Config.Smudge
|
||||
import qualified Utility.RawFilePath as R
|
||||
|
||||
|
@ -176,7 +176,7 @@ getAssociatedFiles k = emptyWhenBare $ runReaderIO AssociatedTable $
|
|||
- in a bare repository, but it might happen if a non-bare repo got
|
||||
- converted to bare. -}
|
||||
emptyWhenBare :: Annex [a] -> Annex [a]
|
||||
emptyWhenBare a = ifM isBareRepo
|
||||
emptyWhenBare a = ifM (Git.Config.isBare <$> gitRepo)
|
||||
( return []
|
||||
, a
|
||||
)
|
||||
|
@ -261,7 +261,7 @@ isInodeKnown i s = or <$> runReaderIO ContentTable
|
|||
- is an associated file.
|
||||
-}
|
||||
reconcileStaged :: Bool -> H.DbQueue -> Annex DbTablesChanged
|
||||
reconcileStaged dbisnew qh = ifM isBareRepo
|
||||
reconcileStaged dbisnew qh = ifM (Git.Config.isBare <$> gitRepo)
|
||||
( return mempty
|
||||
, do
|
||||
gitindex <- inRepo currentIndexFile
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue