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

fix parent

Browse source
This commit is contained in:
Joey Hess 2019-02-22 12:44:22 -04:00
parent bab6c570b0
commit 33bb62ff13
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Annex/Import.hs
View file

@ -67,7 +67,10 @@ buildImportCommit remote basecommit subdir importable commitmode commitmessage =
if basetree == importedtree && null parents if basetree == importedtree && null parents
then return Nothing then return Nothing
else do else do
commit <- inRepo $ Git.Branch.commitTree commitmode commitmessage parents importedtree let commitparents = if null parents
then [basecommit]
else parents
commit <- inRepo $ Git.Branch.commitTree commitmode commitmessage commitparents importedtree
return (Just commit) return (Just commit)
updateexportdb importedtree = updateexportdb importedtree =
withExclusiveLock (gitAnnexExportLock (uuid remote)) $ do withExclusiveLock (gitAnnexExportLock (uuid remote)) $ do