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

assistant: Fix reversion that caused files to be added locked by default.

Browse source 
92c4a34414 added a new config, but used an
existing config, which defaults to true. Oops!
This commit is contained in:
Joey Hess 2025-10-25 09:17:57 -04:00
commit 00c703e4ef
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Threads/Committer.hs
View file

@ -63,7 +63,7 @@ commitThread = namedThread "Committer" $ do
largefilematcher <- liftAnnex largeFilesMatcher largefilematcher <- liftAnnex largeFilesMatcher
annexdotfiles <- liftAnnex $ getGitConfigVal annexDotFiles annexdotfiles <- liftAnnex $ getGitConfigVal annexDotFiles
addunlockedmatcher <- liftAnnex $ addunlockedmatcher <- liftAnnex $
ifM (annexSupportUnlocked <$> Annex.getGitConfig) ifM (annexAssistantAllowUnlocked <$> Annex.getGitConfig)
( Just <$> addUnlockedMatcher ( Just <$> addUnlockedMatcher
, return Nothing , return Nothing
) )

2
CHANGELOG
View file

@ -2,6 +2,8 @@ git-annex (10.20250930) UNRELEASED; urgency=medium
* Support ssh remotes with '#' and '?' in the path to the repository, * Support ssh remotes with '#' and '?' in the path to the repository,
the same way git does. the same way git does.
* assistant: Fix reversion that caused files to be added locked by
default.
-- Joey Hess <id@joeyh.name> Mon, 20 Oct 2025 15:22:30 -0400 -- Joey Hess <id@joeyh.name> Mon, 20 Oct 2025 15:22:30 -0400