git-remote-annex: Fix a reversion
Introduced in version 10.20241031 that broke cloning from a special remote retrieveKeyFile changed to use createAnnexDirectory, which means that the path passed to it needs to be under .git git-remote-annex is probably the only thing in git-annex where that was not the case. And there's no real reason it cannot be the case with it either. Just use withOtherTmp.
This commit is contained in:
parent
d2f540b1d2
commit
700be6c38f
3 changed files with 27 additions and 7 deletions
|
@ -1,3 +1,10 @@
|
|||
git-annex (10.20241032) UNRELEASED; urgency=medium
|
||||
|
||||
* git-remote-annex: Fix a reversion introduced in version 10.20241031
|
||||
that broke cloning from a special remote.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 11 Nov 2024 12:26:00 -0400
|
||||
|
||||
git-annex (10.20241031) upstream; urgency=medium
|
||||
|
||||
* Sped up proxied downloads from special remotes, by streaming.
|
||||
|
|
|
@ -48,6 +48,7 @@ import Annex.Init
|
|||
import Annex.UUID
|
||||
import Annex.Content
|
||||
import Annex.Perms
|
||||
import Annex.Tmp
|
||||
import Annex.SpecialRemote.Config
|
||||
import Remote.List
|
||||
import Remote.List.Util
|
||||
|
@ -719,7 +720,8 @@ downloadManifest rmt = get mkmain >>= maybe (get mkbak) (pure . Just)
|
|||
-- directory. The content of manifests is not stable, and so
|
||||
-- it needs to re-download it fresh every time, and the object
|
||||
-- file should not be stored locally.
|
||||
gettotmp dl = withTmpFile "GITMANIFEST" $ \tmp tmph -> do
|
||||
gettotmp dl = withOtherTmp $ \othertmp ->
|
||||
withTmpFileIn (fromRawFilePath othertmp) "GITMANIFEST" $ \tmp tmph -> do
|
||||
liftIO $ hClose tmph
|
||||
_ <- dl tmp
|
||||
b <- liftIO (B.readFile tmp)
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 2"""
|
||||
date="2024-11-11T16:39:48Z"
|
||||
content="""
|
||||
Fixed by changing it to download to a path under .git
|
||||
|
||||
Also, this directory special remote case makes a good test case so I will
|
||||
add it to the test suite, which will be the first git-remote-annex in the
|
||||
test suite.
|
||||
"""]]
|
Loading…
Reference in a new issue