diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 53663e8b5b..7e41ca8e01 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -63,7 +63,7 @@ commitThread = namedThread "Committer" $ do largefilematcher <- liftAnnex largeFilesMatcher annexdotfiles <- liftAnnex $ getGitConfigVal annexDotFiles addunlockedmatcher <- liftAnnex $ - ifM (annexSupportUnlocked <$> Annex.getGitConfig) + ifM (annexAssistantAllowUnlocked <$> Annex.getGitConfig) ( Just <$> addUnlockedMatcher , return Nothing ) diff --git a/CHANGELOG b/CHANGELOG index 21888c75f1..327fbbed7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ git-annex (10.20250930) UNRELEASED; urgency=medium * Support ssh remotes with '#' and '?' in the path to the repository, the same way git does. + * assistant: Fix reversion that caused files to be added locked by + default. -- Joey Hess Mon, 20 Oct 2025 15:22:30 -0400