From 020c8eaa35d2a8ca281d67339ce487e46a4f57b3 Mon Sep 17 00:00:00 2001 From: sd-trailhead-james Date: Fri, 27 Mar 2020 14:17:47 -0700 Subject: [PATCH] Git::Lib#normalize_encoding early return fix `Git::Lib#normalize_encoding`: when checking to see if the given string is already in the desired encoding, fix the comparison check to compare string value to string value, not class to string value. Signed-off-by: sd-trailhead-james --- lib/git/lib.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git/lib.rb b/lib/git/lib.rb index 8aa7d27d..c10fb392 100644 --- a/lib/git/lib.rb +++ b/lib/git/lib.rb @@ -1050,7 +1050,7 @@ def encoding_options end def normalize_encoding(str) - return str if str.valid_encoding? && str.encoding == default_encoding + return str if str.valid_encoding? && str.encoding.name == default_encoding return str.encode(default_encoding, str.encoding, encoding_options) if str.valid_encoding?