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

refactor RemoteTrackingBranch

Browse source 
Not specific to Import; export will use it too.
This commit is contained in:
Joey Hess 2019-03-01 14:44:22 -04:00
parent d28b0a8bd0
commit 519cadd1de
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/Import.hs
View file

@ -16,7 +16,6 @@ import qualified Command.Add
import qualified Command.Reinject
import qualified Types.Remote as Remote
import qualified Git.Ref
import qualified Git.Branch
import Utility.CopyFile
import Backend
import Types.KeySource
@ -26,6 +25,7 @@ import Annex.FileMatcher
import Annex.Ingest
import Annex.InodeSentinal
import Annex.Import
import Annex.RemoteTrackingBranch
import Utility.InodeCache
import Logs.Location
import Git.FilePath
@ -296,7 +296,7 @@ commitRemote remote branch tb parentcommit importtreeconfig importcommitconfig i
updateremotetrackingbranch importcommit =
case importcommit <|> parentcommit of
Just c -> do
inRepo $ Git.Branch.update' (fromRemoteTrackingBranch tb) c
setRemoteTrackingBranch tb c
return True
Nothing -> do
warning $ "Nothing to import and " ++ fromRef branch ++ " does not exist."