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

comments

Browse source
This commit is contained in:
Joey Hess 2019-05-01 12:37:54 -04:00
parent 83a420dd66
commit d1c283b691
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Annex/Import.hs
View file

@ -174,16 +174,21 @@ buildImportCommit' importcommitconfig mtrackingcommit imported@(History ti _) =
where
go _ Nothing = Just <$> mkcommits imported
go trackingcommit (Just h)
-- If the tracking branch matches the history,
-- nothing new needs to be committed.
| sametodepth imported h' = return Nothing
-- If the tracking branch head is a merge commit
-- with a tree that matches the head of the history,
-- and one side of the merge matches the history,
-- nothing new needs to be committed.
| t == ti && any (sametodepth imported) (S.toList s) = return Nothing
-- Make a merge commit, with one side being the import, and
-- the other being the trackingcommit. This way the history
-- as imported is preserved, even when it differs from the
-- history as exported, and git merge will understand that
-- the history is connected.
| otherwise = do
ci <- mkcommits imported
-- Make a merge commit, with one side being the
-- import, and the other being the trackingcommit.
-- This way the history as imported is preserved,
-- even when it differs from the history as exported,
-- and git merge will understand that the history
-- is connected.
let parents =
[ trackingcommit
, ci