From: Joey Hess Date: Thu, 18 May 2023 18:56:13 +0000 (-0400) Subject: assist: fix bug commiting just added file X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~40^2~156 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc3df2da9efcbf37fe856f4982ebc3f023f0a8b1;p=git-annex.git assist: fix bug commiting just added file --- diff --git a/Command/Assist.hs b/Command/Assist.hs index aaa8ea0376..de26d6c87a 100644 --- a/Command/Assist.hs +++ b/Command/Assist.hs @@ -11,6 +11,7 @@ import Command import qualified Command.Sync import qualified Command.Add import Annex.CheckIgnore +import qualified Annex.Queue cmd :: Command cmd = withAnnexOptions [jobsOption, backendOption] $ @@ -32,6 +33,8 @@ myseek o = startConcurrency transferStages $ do , Command.Add.checkGitIgnoreOption = CheckGitIgnore (False) , Command.Add.dryRunOption = DryRun False } - + -- Flush added files to index so they will be committed. + Annex.Queue.flush + Command.Sync.prepMerge Command.Sync.seek' o