Π·Π΅ΡΠΊΠ°Π»ΠΎ ΠΈΠ· https://github.com/github/ruby.git
Default GIT external encoding to UTF-8 π€·ββοΈ
And dump the title as US-ASCII.
This commit is contained in:
Π ΠΎΠ΄ΠΈΡΠ΅Π»Ρ
17af8bfce6
ΠΠΎΠΌΠΌΠΈΡ
3102ca4c6e
|
@ -59,6 +59,9 @@ vcs = nil
|
|||
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),
|
||||
|
|
|
@ -32,6 +32,7 @@ if RUBY_VERSION < "2.0"
|
|||
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 @@ if RUBY_VERSION < "2.0"
|
|||
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 VCS
|
|||
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
|
||||
|
|
ΠΠ°Π³ΡΡΠ·ΠΊΠ°β¦
Π‘ΡΡΠ»ΠΊΠ° Π² Π½ΠΎΠ²ΠΎΠΉ Π·Π°Π΄Π°ΡΠ΅