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

revert recent lockContent change

Browse source 
lockContent should only be done when it's versioned
This commit is contained in:
Joey Hess 2020-12-28 16:05:14 -04:00
parent 36133f27c0
commit 0990d74574
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/Helper/ExportImport.hs
View file

@ -165,7 +165,7 @@ adjustExportImport' isexport isimport r rs = do
then giveup "dropping content from this remote is not supported because it is configured with importtree=yes" then giveup "dropping content from this remote is not supported because it is configured with importtree=yes"
else removeKey r k else removeKey r k
else removeKey r k else removeKey r k
, lockContent = if versioned || not mergeable , lockContent = if versioned
then lockContent r then lockContent r
else Nothing else Nothing
, retrieveKeyFile = \k af dest p -> , retrieveKeyFile = \k af dest p ->