git-annex 10.20250929 → 10.20251029

raw patch · 5 files changed

+17/−4 lines, 5 files

Files

• Assistant/Threads/Committer.hs +1/−1
• BuildFlags.hs +1/−0
• CHANGELOG +9/−0
• Git.hs +5/−2
• git-annex.cabal +1/−1

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

@@ -64,6 +64,7 @@ 	, "Testsuite" 	, "S3" 	, "WebDAV"+	, "Servant" #ifdef WITH_OSPATH 	, "OsPath" #else 

@@ -1,3 +1,12 @@+git-annex (10.20251029) upstream; 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 <id@joeyh.name>  Wed, 29 Oct 2025 10:04:43 -0400+ git-annex (10.20250929) upstream; urgency=medium    * enableremote: Allow type= to be provided when it does not change the

@@ -38,7 +38,7 @@ 	relPath, ) where -import Network.URI (uriPath, uriScheme, unEscapeString)+import Network.URI (uriPath, uriScheme, uriQuery, uriFragment, unEscapeString) #ifndef mingw32_HOST_OS import System.Posix.Files #endif@@ -73,7 +73,10 @@  - it's the gitdir, and for URL repositories, is the path on the remote  - host. -} repoPath :: Repo -> OsPath-repoPath Repo { location = Url u } = toOsPath $ unEscapeString $ uriPath u+repoPath Repo { location = Url u } = toOsPath $ unEscapeString $+	-- git allows the path of a ssh url to include both '?' and '#',+	-- and treats them as part of the path+	uriPath u ++ uriQuery u ++ uriFragment u repoPath Repo { location = Local { worktree = Just d } } = d repoPath Repo { location = Local { gitdir = d } } = d repoPath Repo { location = LocalUnknown dir } = dir

@@ -1,5 +1,5 @@ Name: git-annex-Version: 10.20250929+Version: 10.20251029 Cabal-Version: 1.12 License: AGPL-3 Maintainer: Joey Hess <id@joeyh.name>