git style quoting for ActionItemOther

Added StringContainingQuotedPath, which is used for ActionItemOther.

In the process, checked every ActionItemOther for those containing
filenames, and made them use quoting.

Sponsored-by: Graham Spencer on Patreon
This commit is contained in:
Joey Hess 2023-04-08 15:48:32 -04:00
parent d689a5b338
commit 2ba1559a8e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
41 changed files with 158 additions and 89 deletions

View file

@ -48,7 +48,7 @@ mergeAnnexBranch = starting "merge" ai si $ do
Annex.Branch.commit =<< Annex.Branch.commitMessage
next $ return True
where
ai = ActionItemOther (Just (fromRef Annex.Branch.name))
ai = ActionItemOther (Just (UnquotedString (fromRef Annex.Branch.name)))
si = SeekInput []
mergeSyncedBranch :: MergeOptions -> CommandStart
@ -63,5 +63,5 @@ mergeBranch o r = starting "merge" ai si $ do
let so = def { notOnlyAnnexOption = True }
next $ merge currbranch mc so Git.Branch.ManualCommit r
where
ai = ActionItemOther (Just (Git.fromRef r))
ai = ActionItemOther (Just (UnquotedString (Git.fromRef r)))
si = SeekInput []