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

Git.Queue: allow providing git common options like -c

Browse source
This commit is contained in:
Joey Hess 2021-01-04 12:51:55 -04:00
parent 36f691e7e5
commit 1c5fc8f047
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Annex/AutoMerge.hs
View file

@ -147,7 +147,7 @@ resolveMerge us them inoverlay = do
unless inoverlay $ do
(deleted, cleanup2) <- inRepo (LsFiles.deleted [] [top])
unless (null deleted) $
Annex.Queue.addCommand "rm"
Annex.Queue.addCommand [] "rm"
[Param "--quiet", Param "-f", Param "--"]
(map fromRawFilePath deleted)
void $ liftIO cleanup2
@ -288,8 +288,13 @@ resolveMerge' unstagedmap (Just us) them inoverlay u = do
resolveby ks a = do
{- Remove conflicted file from index so merge can be resolved. -}
Annex.Queue.addCommand "rm"
[Param "--quiet", Param "-f", Param "--cached", Param "--"] [file]
Annex.Queue.addCommand [] "rm"
[ Param "--quiet"
, Param "-f"
, Param "--cached"
, Param "--"
]
[file]
void a
return (ks, Just file)