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

fix setting imported tree

Browse source 
bf7ecd6892 went too far and broke
importing, the old tree was used on the remote tracking branch and not
the newly imported tree.

Test suite noticed the problem luckily.
This commit is contained in:
Joey Hess 2019-05-06 14:38:02 -04:00
parent 6c7bbe2c5a
commit c5e0f9b3a5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Import.hs
View file

@ -192,7 +192,7 @@ buildImportCommit' importcommitconfig mtrackingcommit imported@(History ti _) =
let oldimportedtrees = mapHistory historyCommitTree oldimported
mknewcommits oldhc oldimportedtrees imported
Just <$> makeRemoteTrackingBranchMergeCommit'
trackingcommit importedcommit
trackingcommit importedcommit ti
where
h'@(History t s) = mapHistory historyCommitTree h