git.rb in ppl-2.4.1

- old
+ new

@@ -22,11 +22,11 @@
   end
 
   def load_address_book
     address_book = Ppl::Entity::AddressBook.new
 
-    head = @repository.lookup(@repository.head.target)
+    head = @repository.lookup(@repository.head.target.oid)
     head.tree.each do |file|
       extension = file[:name].slice(-4..-1)
       if extension != ".vcf"
         next
       end
@@ -75,11 +75,11 @@
       head = @repository.head
     rescue
     end
 
     if !head.nil?
-      parents    = [ @repository.lookup( @repository.head.target ).oid ]
+      parents    = [ @repository.lookup( @repository.head.target.oid ).oid ]
       update_ref = "HEAD"
     else
       parents    = []
       update_ref = "HEAD"
     end
@@ -116,10 +116,11 @@
   private
 
   def read_contact_from_disk(id)
     filename = id + ".vcf"
     target   = @repository.head.target
-    vcard    = @repository.file_at(target, filename)
+    blob     = @repository.blob_at(target.oid, filename)
+    vcard    = blob.nil? ? nil : blob.content
     contact  = nil
 
     if !vcard.nil?
       contact    = @vcard_adapter.decode(vcard)
       contact.id = id