Revert "revert recent bug fix temporarily for release"

This reverts commit 16f1e24665.
This commit is contained in:
Joey Hess 2023-02-14 14:11:23 -04:00
parent dd1a5f4961
commit 672258c8f4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 47 additions and 33 deletions

View file

@ -52,7 +52,7 @@ import Git.Sha
import Git.CatFile
import Git.Branch (writeTreeQuiet, update')
import qualified Git.Ref
import qualified Git.Config
import 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 (Git.Config.isBare <$> gitRepo)
emptyWhenBare a = ifM isBareRepo
( 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 (Git.Config.isBare <$> gitRepo)
reconcileStaged dbisnew qh = ifM isBareRepo
( return mempty
, do
gitindex <- inRepo currentIndexFile