From 5ad01be17c1a9f597baff84cb063779db5539580 Mon Sep 17 00:00:00 2001 From: Eric Mueller Date: Sun, 26 May 2024 23:18:10 -0400 Subject: [PATCH 1/4] When core.ignoreCase, check for changed files case-insensitively Fixed #586. Include a note about the inconsistent behavior when ignoreCase is not set to match the case-sensitivity of the file-system itself. --- lib/git/status.rb | 16 +++++++++++++++- tests/units/test_status.rb | 8 ++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/git/status.rb b/lib/git/status.rb index d31dc7b4..83ba656a 100644 --- a/lib/git/status.rb +++ b/lib/git/status.rb @@ -34,7 +34,11 @@ def changed # changed?('lib/git.rb') # @return [Boolean] def changed?(file) - changed.member?(file) + if ignore_case? + changed.keys.map(&:downcase).include?(file.downcase) + else + changed.member?(file) + end end # Returns an Enumerable containing files that have been added. @@ -264,5 +268,15 @@ def fetch_added end end end + + # It's worth noting that (like git itself) this gem will not behave well if + # ignoreCase is set inconsistently with the file-system itself. For details: + # https://git-scm.com/docs/git-config#Documentation/git-config.txt-coreignoreCase + def ignore_case? + return @_ignore_case if defined?(@_ignore_case) + @_ignore_case = @base.config('core.ignoreCase') == 'true' + rescue Git::FailedError + @_ignore_case = false + end end end diff --git a/tests/units/test_status.rb b/tests/units/test_status.rb index b7ad4888..6065cfc9 100644 --- a/tests/units/test_status.rb +++ b/tests/units/test_status.rb @@ -106,6 +106,7 @@ def test_added_boolean def test_changed_boolean in_temp_dir do |path| git = Git.clone(@wdir, 'test_dot_files_status') + git.config('core.ignorecase', 'false') create_file('test_dot_files_status/test_file_1', 'content tets_file_1') create_file('test_dot_files_status/test_file_2', 'content tets_file_2') @@ -117,6 +118,13 @@ def test_changed_boolean assert(git.status.changed?('test_file_1')) assert(!git.status.changed?('test_file_2')) + + update_file('test_dot_files_status/scott/text.txt', 'definitely different') + assert(git.status.changed?('scott/text.txt')) + assert(!git.status.changed?('scott/TEXT.txt')) + + git.config('core.ignorecase', 'true') + assert(git.status.changed?('scott/TEXT.txt')) end end From 509986e81e9e17cd9a1866b5d2115622e20bb60d Mon Sep 17 00:00:00 2001 From: Eric Mueller Date: Sun, 26 May 2024 23:21:47 -0400 Subject: [PATCH 2/4] When core.ignoreCase, check for added files case-insensitively --- lib/git/status.rb | 6 +++++- tests/units/test_status.rb | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/git/status.rb b/lib/git/status.rb index 83ba656a..615222d0 100644 --- a/lib/git/status.rb +++ b/lib/git/status.rb @@ -58,7 +58,11 @@ def added # added?('lib/git.rb') # @return [Boolean] def added?(file) - added.member?(file) + if ignore_case? + added.keys.map(&:downcase).include?(file.downcase) + else + added.member?(file) + end end # diff --git a/tests/units/test_status.rb b/tests/units/test_status.rb index 6065cfc9..32bba297 100644 --- a/tests/units/test_status.rb +++ b/tests/units/test_status.rb @@ -92,6 +92,7 @@ def test_dot_files_status def test_added_boolean in_temp_dir do |path| git = Git.clone(@wdir, 'test_dot_files_status') + git.config('core.ignorecase', 'false') create_file('test_dot_files_status/test_file_1', 'content tets_file_1') create_file('test_dot_files_status/test_file_2', 'content tets_file_2') @@ -100,6 +101,10 @@ def test_added_boolean assert(git.status.added?('test_file_1')) assert(!git.status.added?('test_file_2')) + assert(!git.status.added?('TEST_FILE_1')) + + git.config('core.ignorecase', 'true') + assert(git.status.added?('TEST_FILE_1')) end end From c7532e88354f8bee1035ff8d48b2f7a5a9b5c8ee Mon Sep 17 00:00:00 2001 From: Eric Mueller Date: Sun, 26 May 2024 23:25:34 -0400 Subject: [PATCH 3/4] When core.ignoreCase, check for deleted files case-insensitively --- lib/git/status.rb | 6 +++++- tests/units/test_status.rb | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/git/status.rb b/lib/git/status.rb index 615222d0..f48d162e 100644 --- a/lib/git/status.rb +++ b/lib/git/status.rb @@ -83,7 +83,11 @@ def deleted # deleted?('lib/git.rb') # @return [Boolean] def deleted?(file) - deleted.member?(file) + if ignore_case? + deleted.keys.map(&:downcase).include?(file.downcase) + else + deleted.member?(file) + end end # diff --git a/tests/units/test_status.rb b/tests/units/test_status.rb index 32bba297..b691c32f 100644 --- a/tests/units/test_status.rb +++ b/tests/units/test_status.rb @@ -136,6 +136,7 @@ def test_changed_boolean def test_deleted_boolean in_temp_dir do |path| git = Git.clone(@wdir, 'test_dot_files_status') + git.config('core.ignorecase', 'false') create_file('test_dot_files_status/test_file_1', 'content tets_file_1') create_file('test_dot_files_status/test_file_2', 'content tets_file_2') @@ -146,6 +147,10 @@ def test_deleted_boolean assert(git.status.deleted?('test_file_1')) assert(!git.status.deleted?('test_file_2')) + assert(!git.status.deleted?('TEST_FILE_1')) + + git.config('core.ignorecase', 'true') + assert(git.status.deleted?('TEST_FILE_1')) end end From fd6bc674bde777770c72a087314d3b8114f36929 Mon Sep 17 00:00:00 2001 From: Eric Mueller Date: Sun, 26 May 2024 23:27:19 -0400 Subject: [PATCH 4/4] When core.ignoreCase, check for untracked files case-insensitively --- lib/git/status.rb | 6 +++++- tests/units/test_status.rb | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/git/status.rb b/lib/git/status.rb index f48d162e..f937cba1 100644 --- a/lib/git/status.rb +++ b/lib/git/status.rb @@ -108,7 +108,11 @@ def untracked # untracked?('lib/git.rb') # @return [Boolean] def untracked?(file) - untracked.member?(file) + if ignore_case? + untracked.keys.map(&:downcase).include?(file.downcase) + else + untracked.member?(file) + end end def pretty diff --git a/tests/units/test_status.rb b/tests/units/test_status.rb index b691c32f..36543bc1 100644 --- a/tests/units/test_status.rb +++ b/tests/units/test_status.rb @@ -207,6 +207,7 @@ def test_untracked_from_subdir def test_untracked_boolean in_temp_dir do |path| git = Git.clone(@wdir, 'test_dot_files_status') + git.config('core.ignorecase', 'false') create_file('test_dot_files_status/test_file_1', 'content tets_file_1') create_file('test_dot_files_status/test_file_2', 'content tets_file_2') @@ -214,6 +215,10 @@ def test_untracked_boolean assert(git.status.untracked?('test_file_1')) assert(!git.status.untracked?('test_file_2')) + assert(!git.status.untracked?('TEST_FILE_1')) + + git.config('core.ignorecase', 'true') + assert(git.status.untracked?('TEST_FILE_1')) end end