git-status-tree 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0823206680a82016025ca4859cd9d0b7baf30ec61c51e2f5201f0dceeac9d20
-  data.tar.gz: 731c9421ae4eeffe679b3c65f2bc5816fe949aae33af6aa4082694eb8b133b66
+  metadata.gz: 92b497a283f3b3e3c260ea64423ad9350acc0973821ebad9b69fe2368cdf0324
+  data.tar.gz: 8fec32b7303b4de5e2390655b1d20ee53c4c7197cedba99fa17db348fbe942e8
 SHA512:
-  metadata.gz: 050262f9aa55d5768e1a63dfa199f035f2a3cb34d519bd1f703fd2e0405cdef23c5440449e46c3087f3349360107de5045ef60a07052a9d15667905136b56f52
-  data.tar.gz: cb498d741fbf7c4c2cf84475b0d69b0bf1857318e2ea45279dc5bc4fb54adcceb8e2fed576c66aa42e781de2cfdf7a9ba7be99a1686c4d77eb413740bd469aa7
+  metadata.gz: d551f8f7cb67163edde8680402d0092bb590ade73a4c4ec4ad97cf7551937e6d983f71e261eca8c5b27773bb9a51d7782a9c6096d80ef01a2afa4cd3947c74db
+  data.tar.gz: f1eb272a459af1b52b8c13c59fd1d510ff43c213692ed6159a53e4e468405b96711d3b5b7314acd6d2d45df7ae666c3a289149143381a50ba20d5e3fab659de0

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.5.1

data/src/git_status_tree.rb

@@ -13,7 +13,7 @@ class GitStatusTree
   def initialize(options = {})
     Node.indent = indent(options)
     Node.collapse_dirs = collapse(options)
-    @files = `git status --porcelain#{untracked_files(options)}`.split("\n")
+    @files = parse_status(`git status --porcelain -z#{untracked_files(options)}`)
     @nodes = files.map { |file| Node.create_from_string file }
     @tree = nodes.reduce { |a, i| (a + i).nodes[0] }
   end
@@ -28,6 +28,38 @@ class GitStatusTree
 
   private
 
+  # Parse NUL-terminated `git status --porcelain -z` output into porcelain
+  # entry strings. Unlike the default output, -z never quotes or escapes
+  # paths, so names with spaces, non-ASCII characters, quotes, backslashes
+  # or tabs survive intact. Rename/copy entries span two NUL-separated
+  # tokens ("<XY> <dest>\0<orig>\0") and are reassembled into the
+  # "<XY> <orig> -> <dest>" form the node parser expects.
+  def parse_status(raw)
+    # Paths are emitted as raw UTF-8 bytes; tag them so names display literally.
+    tokens = raw.force_encoding('UTF-8').split("\0")
+    files = []
+    index = 0
+    while index < tokens.length
+      entry = tokens[index]
+      index += 1
+      next if entry.nil? || entry.empty?
+
+      if rename_or_copy?(entry)
+        orig = tokens[index]
+        index += 1
+        files << "#{entry[0, 3]}#{orig} -> #{entry[3..]}"
+      else
+        files << entry
+      end
+    end
+    files
+  end
+
+  def rename_or_copy?(entry)
+    status = entry[0, 2]
+    status.include?('R') || status.include?('C')
+  end
+
   def indent(options)
     indent = options[:indent] || config || 4
     indent = 2 if indent < 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-status-tree
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Wolfgang Teuber