Default GIT external encoding to UTF-8 🤷‍♂️

nobu · nobu · commit 3102ca4c6e0b · 2019-06-03T12:54:33.000+09:00
And dump the title as US-ASCII.
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
@@ -59,6 +59,9 @@ def self.output=(output)
   when :revision_h
     Proc.new {|last, changed, modified, branch, title|
       short = vcs.short_revision(last)
+      if /[^\x00-\x7f]/ =~ title and title.respond_to?(:force_encoding)
+        title = title.dup.force_encoding("US-ASCII")
+      end
       [
         "#define RUBY_REVISION #{short.inspect}",
         ("#define RUBY_FULL_REVISION #{last.inspect}" unless short == last),
diff --git a/tool/vcs.rb b/tool/vcs.rb
@@ -32,6 +32,7 @@ def self.popen(command, *rest, &block)
         if opts.kind_of?(Hash)
           dir = opts.delete(:chdir)
           rest.pop if opts.empty?
+          opts.delete(:external_encoding)
         end
 
         if block
@@ -66,6 +67,7 @@ def self.popen(command, *rest, &block)
         if opts.kind_of?(Hash)
           dir = opts.delete(:chdir)
           rest.pop if opts.empty?
+          opts.delete(:external_encoding)
         end
 
         command = command.shelljoin if Array === command
@@ -384,8 +386,9 @@ class GIT < self
     COMMAND = ENV["GIT"] || 'git'
 
     def self.cmd_args(cmds, srcdir = nil)
+      (opts = cmds.last).kind_of?(Hash) or cmds << (opts = {})
+      opts[:external_encoding] ||= "UTF-8"
       if srcdir and local_path?(srcdir)
-        (opts = cmds.last).kind_of?(Hash) or cmds << (opts = {})
         opts[:chdir] ||= srcdir
       end
       cmds
