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

make merge commit on export that preserves the import history

Browse source
This commit is contained in:
Joey Hess 2019-05-01 13:13:00 -04:00
parent d1c283b691
commit 2bd0e07ed8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 47 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Export.hs
View file

@ -235,7 +235,8 @@ fillExport r db newtree mtbcommitsha = do
Nothing -> noop
Just (tb, commitsha) ->
whenM (liftIO $ fromAllFilled <$> takeMVar allfilledvar) $
setRemoteTrackingBranch tb commitsha
makeRemoteTrackingBranchMergeCommit tb commitsha newtree
>>= setRemoteTrackingBranch tb
liftIO $ fromFileUploaded <$> takeMVar cvar

2
Command/Import.hs
View file

@ -266,7 +266,7 @@ seekRemote remote branch msubdir = do
Nothing -> giveup $ "Unable to find base tree for branch " ++ fromRef branch
trackingcommit <- fromtrackingbranch Git.Ref.sha
let importcommitconfig = ImportCommitConfig trackingcommit ManualCommit importmessage
let importcommitconfig = ImportCommitConfig trackingcommit AutomaticCommit importmessage
let commitimport = commitRemote remote branch tb trackingcommit importtreeconfig importcommitconfig
importabletvar <- liftIO $ newTVarIO Nothing