This commit is contained in:
Joey Hess 2022-12-09 12:18:37 -04:00
parent 65f9e7a3c7
commit e29bc2b7d7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -0,0 +1,29 @@
[[!comment format=mdwn
username="joey"
subject="""comment 10"""
date="2022-12-09T16:16:10Z"
content="""
The retest seemed to hang again, but I'm not sure I was testing the right
binary. Running it again.
This patch exposes when the lock is held and so illustrates the bug
reliably and quickly:
diff --git a/Command/Smudge.hs b/Command/Smudge.hs
index a5d8871998..cf6e2973f8 100644
--- a/Command/Smudge.hs
+++ b/Command/Smudge.hs
@@ -127,7 +129,8 @@ clean'
-> (Key -> Annex ())
-- ^ emitpointer: Emit a pointer file for the key.
-> Annex ()
-clean' file mk passthrough discardreststdin emitpointer =
+clean' file mk passthrough discardreststdin emitpointer = do
+ calcRestageLog () (\_ _ -> ())
ifM (fileOutsideRepo file)
( passthrough
, inSmudgeCleanFilter go
With that patch, the unfixed git-annex hangs immediately. With
my fix, it does not hang, which seems to show I fixed it correctly..
"""]]