From 33bb62ff13d5534bc201aadf6b1a8b111f79bc79 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Feb 2019 12:44:22 -0400 Subject: [PATCH] fix parent --- Annex/Import.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Annex/Import.hs b/Annex/Import.hs index e21a3d0ee2..ca2305fe35 100644 --- a/Annex/Import.hs +++ b/Annex/Import.hs @@ -67,7 +67,10 @@ buildImportCommit remote basecommit subdir importable commitmode commitmessage = if basetree == importedtree && null parents then return Nothing 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) updateexportdb importedtree = withExclusiveLock (gitAnnexExportLock (uuid remote)) $ do