gitlab_git 10.6.4 → 10.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5415dadf9d220102e60808ce90da48ae04c01d51
-  data.tar.gz: 0d50f0dca69aa08ebf13668edc93bbce2a10ea53
+  metadata.gz: 3cb54c76a3f5d53c29e936c788772f642fbe8bfb
+  data.tar.gz: 9b37e24978c2b08dec01e56e52239d4911fb895b
 SHA512:
-  metadata.gz: 55e01cc03c7a744321cb825c568200df8ba55e20f830f85a0b2ffcfb1fba416b399220cce1a444bb5e68cd2d3677a8dc8d61071dd58032dc872240da7f0f654d
-  data.tar.gz: 8e3c8701cb9f258b0252d9976113d5db8f3185a3e41e9dea0343a229c5265622310232ee5ca79a243620da156319d38bbb628b2b587d11f6f5787ddfef292ceb
+  metadata.gz: 5fde0a94a712170d0320f94850fc3662a5447526288d49cfa450ea3a92364c6223ace31bf99816c698504bfac58f100adfe46679c0fb08443f9aef9bfd18c8c8
+  data.tar.gz: 6396cfeb6132d169a674418bd7b11aec5be93d7c6ca96bfd385dfab85d712990cd2f38667f58edae7f7784efc18fa40d8b545e505e280380d4a6344315a7abb2

data/VERSION

@@ -1 +1 @@
-10.6.4
+10.6.5

data/lib/gitlab_git/blob.rb

@@ -131,6 +131,7 @@ module Gitlab
           ref = commit[:branch]
           update_ref = commit[:update_ref].nil? ? true : commit[:update_ref]
           parents = []
+          mode = 0o100644
 
           unless ref.start_with?('refs/')
             ref = 'refs/heads/' + ref
@@ -154,17 +155,18 @@ module Gitlab
           if action == :remove
             index.remove(filename)
           else
+            file_entry = index.get(filename)
+
             if action == :rename
               old_path_name = PathHelper.normalize_path(file[:previous_path])
               old_filename = old_path_name.to_s
-              index.remove(old_filename)
+              file_entry = index.get(old_filename)
+              index.remove(old_filename) unless file_entry.blank?
             end
 
-            mode = 0o100644
-            file_entry = index.get(filename)
-
             if file_entry
               raise Repository::InvalidBlobName.new("Filename already exists; update not allowed") unless update
+
               # Preserve the current file mode if one is available
               mode = file_entry[:mode] if file_entry[:mode]
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.6.4
+  version: 10.6.5
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist