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

fix inverted logic (fixes test fail)

Browse source 
Sponsored-by: Jack Hill on Patreon
This commit is contained in:
Joey Hess 2023-05-18 10:15:04 -04:00
parent 6b236ca58b
commit 935330aaab
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Command/Sync.hs
View file

@ -190,12 +190,12 @@ optParser mode desc = SyncOptions
<> help "transfer contents of annexed files in a given location" <> help "transfer contents of annexed files in a given location"
<> metavar paramPath <> metavar paramPath
)) ))
<*> unlessmode PullMode False (switch <*> whenmode PullMode False (switch
( long "cleanup" ( long "cleanup"
<> help "remove synced/ branches from previous sync" <> help "remove synced/ branches from previous sync"
)) ))
<*> optional parseAllOption <*> optional parseAllOption
<*> unlessmode PushMode False (invertableSwitch "resolvemerge" True <*> whenmode PushMode False (invertableSwitch "resolvemerge" True
( help "do not automatically resolve merge conflicts" ( help "do not automatically resolve merge conflicts"
)) ))
<*> case mode of <*> case mode of
@ -204,8 +204,11 @@ optParser mode desc = SyncOptions
<*> pure mode <*> pure mode
where where
unlessmode m v a unlessmode m v a
| mode /= m = a | mode /= m = pure v
| otherwise = pure v | otherwise = a
whenmode m v a
| mode == m = pure v
| otherwise = a
parseUnrelatedHistoriesOption :: Parser Bool parseUnrelatedHistoriesOption :: Parser Bool
parseUnrelatedHistoriesOption = parseUnrelatedHistoriesOption =