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

Propagate --force to git-annex transferrer

Browse source 
And other child processes.
This commit is contained in:
Joey Hess 2024-07-23 21:16:56 -04:00
parent 7d4045277a
commit f7404a64c0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/Path.hs
View file

@ -85,7 +85,11 @@ gitAnnexChildProcess subcmd ps f a = do
gitAnnexChildProcessParams :: String -> [CommandParam] -> Annex [CommandParam] gitAnnexChildProcessParams :: String -> [CommandParam] -> Annex [CommandParam]
gitAnnexChildProcessParams subcmd ps = do gitAnnexChildProcessParams subcmd ps = do
cps <- gitAnnexGitConfigOverrides cps <- gitAnnexGitConfigOverrides
return (Param subcmd : cps ++ ps) force <- Annex.getRead Annex.force
let cps' = if force
then Param "--force" : cps
else cps
return (Param subcmd : cps' ++ ps)
gitAnnexGitConfigOverrides :: Annex [CommandParam] gitAnnexGitConfigOverrides :: Annex [CommandParam]
gitAnnexGitConfigOverrides = concatMap (\c -> [Param "-c", Param c]) gitAnnexGitConfigOverrides = concatMap (\c -> [Param "-c", Param c])

1
CHANGELOG
View file

@ -6,6 +6,7 @@ git-annex (10.20240702) UNRELEASED; urgency=medium
git-annex remotedaemon is killed while locking a key to prevent its git-annex remotedaemon is killed while locking a key to prevent its
removal. removal.
* Added a dependency on clock. * Added a dependency on clock.
* Propagate --force to git-annex transferrer.
-- Joey Hess <id@joeyh.name> Tue, 02 Jul 2024 12:14:53 -0400 -- Joey Hess <id@joeyh.name> Tue, 02 Jul 2024 12:14:53 -0400

2
doc/bugs/force_option_not_propagated_to_git-annex-transferrer.mdwn
View file

@ -4,3 +4,5 @@ setting, the message displayed says that --force will override the check.
But that doesn't work in this case. But that doesn't work in this case.
The --force option should be propagated to this command. --[[Joey]] The --force option should be propagated to this command. --[[Joey]]
> [[fixed|done]] --[[Joey]]