gitlab_git 7.2.2 → 7.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79a788ed1b01dd6745f14f8b4bdd751cbb81f4c
-  data.tar.gz: d3c8736e04433cd4e2631de49b74600e098a551e
+  metadata.gz: 7ad3eba0dfcc190e467ced575b45ff76ecda8341
+  data.tar.gz: d84427c2959020528eb4e95ddb0ce0695233fdf8
 SHA512:
-  metadata.gz: 7dd22814ea99a800d59f262c561b38bff37ff9955dfc331ecb7e6acf333ddf5cada2335cf94cf09ce32917b88eefb4962073e1de41b6b2a4c9e71c907bc8f4b6
-  data.tar.gz: abcb49969f9cdba0a25ee9b8014ccf2376517b451fb12acad28602449b97c47cb98515ee9e5ca87892fdcddba1a646efede07c375757d54fd6e39414bd338d33
+  metadata.gz: a02da9782146a7c55c5ebce0104962b23bed7539917b18a2837e1014f168b76bcd41cad602be7eca5c66d3c0addf79f734494962633769fa5dbe48b49bca0916
+  data.tar.gz: e4e5dd0c64f93ba15e2668e98599b6cd8a292cd4b2a21f0d274ba0a2d2c149dd031f7f03acfc0c0524037d0388ec1fd4f296d6f351e7f802471fae982ca9f5e2

data/VERSION

@@ -1 +1 @@
-7.2.2
+7.2.3

data/lib/gitlab_git/blob.rb

@@ -106,25 +106,37 @@ module Gitlab
         #     branch: 'master'
         #   }
         #
-        def commit(repository, options)
+        def commit(repository, options, action = :add)
           file = options[:file]
           author = options[:author]
           committer = options[:committer]
           commit = options[:commit]
           repo = repository.rugged
+          ref = 'refs/heads/' + commit[:branch]
+          parents = []
 
-          oid = repo.write(file[:content], :blob)
           index = repo.index
-          index.read_tree(repo.head.target.tree) unless repo.empty?
-          index.add(path: file[:path], oid: oid, mode: 0100644)
+
+          unless repo.empty?
+            last_commit = repo.references[ref].target
+            index.read_tree(last_commit.tree)
+            parents = [last_commit]
+          end
+
+          if action == :remove
+            index.remove(file[:path])
+          else
+            oid = repo.write(file[:content], :blob)
+            index.add(path: file[:path], oid: oid, mode: 0100644)
+          end
 
           opts = {}
           opts[:tree] = index.write_tree(repo)
           opts[:author] = author
           opts[:committer] = committer
           opts[:message] = commit[:message]
-          opts[:parents] = repo.empty? ? [] : [ repo.head.target ].compact
-          opts[:update_ref] = 'refs/heads/' + commit[:branch]
+          opts[:parents] = parents
+          opts[:update_ref] = ref
 
           Rugged::Commit.create(repo, opts)
         end
@@ -151,25 +163,7 @@ module Gitlab
         #   }
         #
         def remove(repository, options)
-          file = options[:file]
-          author = options[:author]
-          committer = options[:committer]
-          commit = options[:commit]
-          repo = repository.rugged
-
-          index = repo.index
-          index.read_tree(repo.head.target.tree) unless repo.empty?
-          index.remove(file[:path])
-
-          opts = {}
-          opts[:tree] = index.write_tree(repo)
-          opts[:author] = author
-          opts[:committer] = committer
-          opts[:message] = commit[:message]
-          opts[:parents] = repo.empty? ? [] : [ repo.head.target ].compact
-          opts[:update_ref] = 'refs/heads/' + commit[:branch]
-
-          Rugged::Commit.create(repo, opts)
+          commit(repository, options, :remove)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.2
+  version: 7.2.3
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist