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

fix assist to commit

Browse source
This commit is contained in:
Joey Hess 2023-05-18 14:50:05 -04:00
parent 9ec5d7fb05
commit 9619f562f4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Command/Assist.hs
View file

@ -34,10 +34,4 @@ myseek o = startConcurrency transferStages $ do
}
Command.Sync.prepMerge
Command.Sync.seek' o'
where
o'
| Command.Sync.contentOption o == Nothing
&& Command.Sync.noContentOption o == Nothing =
o { Command.Sync.contentOption = Just True }
| otherwise = o
Command.Sync.seek' o

12
Command/Sync.hs
View file

@ -152,10 +152,14 @@ optParser mode desc = SyncOptions
( long "not-only-annex"
<> help "operate on git branches as well as annex"
)
<*> unlessmode [SyncMode] False (switch
( long "commit"
<> help "commit changes to git"
))
<*> case mode of
SyncMode -> switch
( long "commit"
<> help "commit changes to git"
)
PushMode -> pure False
PullMode -> pure False
AssistMode -> pure True
<*> unlessmode [SyncMode] True (switch
( long "no-commit"
<> help "avoid git commit"