From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 5 Nov 2021 16:43:33 +0000 (-0400)
Subject: Revert "disable filter.annex.process in restagePointerFile"
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~2^2^2~57^2~52
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=837025b14f523f9180f82d0cced1e53a8a9b94de;p=git-annex.git

Revert "disable filter.annex.process in restagePointerFile"

This reverts commit afe327ac4947d6d32ff888e7485509be03d9baaf.

Unfortunately, disabling it by setting it to "" does not work, git
then ignores filter.annex.smudge/clean, and does not pass files through
git-annex at all.

I don't think there is a way to temporarily disable this git config
from the git command line. Which seems like a bug in git.

So, it may be more expensive than anticipated to enable
filter.annex.process, since git checkout etc will pipe all annexed files
being checked out through it.
---

diff --git a/Annex/Link.hs b/Annex/Link.hs
index 9e019d7d6a..878228788d 100644
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
@@ -221,18 +221,10 @@ restagePointerFile (Restage True) f orig = withTSDelta $ \tsd ->
 			let updatetmpindex = do
 				r' <- liftIO $ Git.Env.addGitEnv r Git.Index.indexEnv
 					=<< Git.Index.indexEnvVal (toRawFilePath tmpindex)
+				-- Avoid git warning about CRLF munging.
 				let r'' = r' { gitGlobalOpts = gitGlobalOpts r' ++
-					-- Avoid git warning about CRLF munging.
 					[ Param "-c"
 					, Param $ "core.safecrlf=" ++ boolConfig False
-					-- Avoid using git-annex
-					-- filter-process, because git
-					-- pipes the content of annexed
-					-- files into it; using
-					-- git-annex smudge --clean is
-					-- probably faster.
-					, Param "-c"
-					, Param $ "filter.annex.process="
 					] }
 				runsGitAnnexChildProcessViaGit' r'' $ \r''' ->
 					liftIO $ Git.UpdateIndex.refreshIndex r''' $ \feed ->