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

enableremote: Allow type= to be provided when it does not change the type of the special remote

Browse source 
Fixes breakage in datalad test suite
https://github.com/datalad/datalad/issues/7747

Also, revert the change I earlier made to git-annex's own test suite due to
the same problem.
This commit is contained in:
Joey Hess 2025-09-29 10:40:10 -04:00
commit c20b8610b6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Command/EnableRemote.hs
View file

@ -59,11 +59,9 @@ start _ [] = unknownNameError "Specify the remote to enable."
start o (name:rest) = go =<< filter matchingname <$> Annex.getGitRemotes
where
matchingname r = Git.remoteName r == Just name
go [] = deadLast name $
let config = Logs.Remote.keyValToConfig Proposed rest
in case M.lookup SpecialRemote.typeField config of
Nothing -> startSpecialRemote o name config
Just _ -> giveup "Cannot change type= of existing special remote. Instead, use: git-annex initremote --sameas"
go [] = deadLast name $
startSpecialRemote o name $
Logs.Remote.keyValToConfig Proposed rest
go (r:_)
| not (null rest) = go []
| otherwise = do
@ -105,6 +103,10 @@ startSpecialRemote' cname perform name config ((u, c, mcu):[]) =
starting cname ai si $ do
let fullconfig = config `M.union` c
t <- either giveup return (SpecialRemote.findType fullconfig)
case SpecialRemote.findType c of
Right t' | t' /= t ->
giveup "Cannot change type= of existing special remote. Instead, use: git-annex initremote --sameas"
_ -> noop
gc <- maybe (liftIO dummyRemoteGitConfig)
(return . Remote.gitconfig)
=<< Remote.byUUID u