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

Allow find --branch to be used in a bare repository, the same as the deprecated findref can be

Browse source 
This will allow later fully deprecating and removing findref.

Sponsored-by: Erik Bjäreholt on Patreon
This commit is contained in:
Joey Hess 2022-07-29 12:52:12 -04:00
parent d8f94389e1
commit 570b1aa6a1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -8,6 +8,8 @@ git-annex (10.20220725) UNRELEASED; urgency=medium
concurrency is enabled. concurrency is enabled.
* stack.yaml: Updated to lts-19.16 * stack.yaml: Updated to lts-19.16
* Added new matching options --want-get-by and --want-drop-by. * Added new matching options --want-get-by and --want-drop-by.
* Allow find --branch to be used in a bare repository, the same as
the deprecated findref can be.
-- Joey Hess <id@joeyh.name> Mon, 25 Jul 2022 15:35:45 -0400 -- Joey Hess <id@joeyh.name> Mon, 25 Jul 2022 15:35:45 -0400

5
Command.hs
View file

@ -122,7 +122,10 @@ repoExists :: CommandCheck
repoExists = CommandCheck 0 ensureInitialized repoExists = CommandCheck 0 ensureInitialized
notBareRepo :: Command -> Command notBareRepo :: Command -> Command
notBareRepo = addCheck $ whenM (fromRepo Git.repoIsLocalBare) $ notBareRepo = addCheck checkNotBareRepo
checkNotBareRepo :: Annex ()
checkNotBareRepo = whenM (fromRepo Git.repoIsLocalBare) $
giveup "You cannot run this command in a bare repository." giveup "You cannot run this command in a bare repository."
noDaemonRunning :: Command -> Command noDaemonRunning :: Command -> Command

4
Command/Find.hs
View file

@ -21,7 +21,7 @@ import qualified Utility.Format
import Utility.DataUnits import Utility.DataUnits
cmd :: Command cmd :: Command
cmd = notBareRepo $ withAnnexOptions [annexedMatchingOptions] $ mkCommand $ cmd = withAnnexOptions [annexedMatchingOptions] $ mkCommand $
command "find" SectionQuery "lists available files" command "find" SectionQuery "lists available files"
paramPaths (seek <$$> optParser) paramPaths (seek <$$> optParser)
@ -55,6 +55,8 @@ parseFormatOption =
seek :: FindOptions -> CommandSeek seek :: FindOptions -> CommandSeek
seek o = do seek o = do
unless (isJust (keyOptions o)) $
checkNotBareRepo
islimited <- limited islimited <- limited
let seeker = AnnexedFileSeeker let seeker = AnnexedFileSeeker
{ startAction = start o { startAction = start o