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

scanAnnexedFiles in smudge --update

Browse source 
This makes git checkout and git merge hooks do the work to catch up with
changes that they made to the tree. Rather than doing it at some later
point when the user is not thinking about that past operation.

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2021-06-08 11:34:46 -04:00
parent c380687aa3
commit 13b9a288d3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/Init.hs
View file

@ -37,7 +37,6 @@ import Annex.UUID
import Annex.WorkTree
import Annex.Fixup
import Annex.Path
import Annex.Concurrent
import Config
import Config.Files
import Config.Smudge
@ -134,8 +133,7 @@ initialize' mversion = checkInitializeAllowed $ do
then configureSmudgeFilter
else deconfigureSmudgeFilter
unlessM isBareRepo $ do
showSideActionAfter oneSecond "scanning for annexed files" $
scanAnnexedFiles
scanAnnexedFiles True
hookWrite postCheckoutHook
hookWrite postMergeHook
AdjustedBranch.checkAdjustedClone >>= \case