gitlab_git 10.6.2 → 10.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a202d39e517407a71c115e39467fb8553a4b3f47
-  data.tar.gz: 4ad70784b155beb212a5c6871714ce8dc3b33f09
+  metadata.gz: d7297d7f12907c147d8b039f91aa75a16487a906
+  data.tar.gz: 1de3808442341ecfad0353eef558ba61324f658c
 SHA512:
-  metadata.gz: 074107c720aebcb96a15ca9c2643288c2f02dcd699cafc3e7e2482c519277efd108d4d424233a0740a28f57674eb3352e4528fc47ffdb16988632d714d11c183
-  data.tar.gz: 6bb3b46d30f6cb1cf4b423947278991b2e87f65f821357dbf5dc16c6c5bb7991b3ec21721c0af3d4a4cbd161878674008896aa82dcfc2fa15051d72190643cbf
+  metadata.gz: 8c9dfac728a81523ed04bdf3342e9e1a332348246db2ef10013f70f793170858c5900ed9add33c969d5f93031b402f157ec92cab2ad813e04dfb10205d51332b
+  data.tar.gz: 0ebaf2bd41d9ce8bf6babdc4d8a4859d6f80c233606cf108cc9dbdf57dc2685819afaea35f431a540f1eeeafc4d93c35fe2d2939e76405c2a7b8eef50247621e

data/VERSION

@@ -1 +1 @@
-10.6.2
+10.6.3

data/lib/gitlab_git/attributes.rb

@@ -57,28 +57,35 @@ module Gitlab
         values = {}
         dash = '-'
         equal = '='
+        binary = 'binary'
 
         string.split(/\s+/).each do |chunk|
           # Data such as "foo = bar" should be treated as "foo" and "bar" being
           # separate boolean attributes.
           next if chunk == equal
 
+          key = chunk
+
           # Input: "-foo"
           if chunk.start_with?(dash)
             key = chunk.byteslice(1, chunk.length - 1)
-
-            values[key] = false
+            value = false
 
           # Input: "foo=bar"
           elsif chunk.include?(equal)
             key, value = chunk.split(equal, 2)
 
-            values[key] = value
-
           # Input: "foo"
           else
-            values[chunk] = true
+            value = true
           end
+
+          values[key] = value
+
+          # When the "binary" option is set the "diff" option should be set to
+          # the inverse. If "diff" is later set it should overwrite the
+          # automatically set value.
+          values['diff'] = false if key == binary && value
         end
 
         values

metadata

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