Make sure treechanges and statuses are case-sensitive #365

yorah · 2013-03-15T14:03:32Z

This behavior has been discussed in #344.

yorah · 2013-03-15T14:13:47Z

This is also related to #345.

dahlbyk · 2013-03-15T14:47:25Z

Tests look good to me. I'm confused why d9d866f is failing on CanEnumerateAllCommits()...nothing related should have changed.

yorah · 2013-03-18T11:18:26Z

Rebased on top of vNext.

I moved CreateBlob() in a new OdbHelper class, to avoid cross-references.
Please note that the tests do pass on Mono (ignorecase = true skips the offending tests). The failure happens only on Windows.

dahlbyk · 2013-03-18T17:10:10Z

LibGit2Sharp.Tests/TestHelpers/OdbHelper.cs

+{
+    public static class OdbHelper
+    {
+        public static Blob CreateBlob(Repository repo, string content)


Maybe we don't want to go down this path, but could this just be a test project extension method on ObjectDatabase?

Wouldn't it be confusing for people who read Unit Tests to understand how to use the library? They could mistake this extension method for a real method exposed by LibGit2Sharp.

Good point.

Leave as-is?

CreateTestBlob()?

Move the helper into the project proper, perhaps with an optional encoder? Could be handy for consumers, perhaps even in their own testing.

nulltoken · 2013-03-28T15:03:26Z

@yorah What's the status regarding this PR?

yorah · 2013-03-28T15:31:02Z

The tests fail on Windows (works on Mono, but just because the test is skipped). I think for the same reason than #345 (or if not, something very closely related).

I believe that the fixes needed to make those tests pass will come from libgit2, and I've been willing to write some failing C tests to open an issue about. Hopefully I will have time to do that soon.

yorah · 2013-04-26T09:05:27Z

@arrbee's libgit2/libgit2#1499 partially fixes this PR (the diff tree to tree test is now passing, however the status retrieval is still inconsistent with git.git on Windows).

git.git behaviour (with a breakpoint in StatusFixture.RetrievingStatusMustAlwaysBeCaseSensitive()):

$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       deleted:    A.TXT
#       deleted:    a.txt
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       a.TxT

Test output

a.txt is NonExistent
A.TXT is Removed | Untracked
a.TxT is NonExistent

yorah · 2013-05-06T10:31:42Z

I just rebased this PR, and split it in two commits so that the first one can get merged.

nulltoken · 2013-05-06T11:42:58Z

I just rebased this PR, and split it in two commits so that the first one can get merged.

Awesome! dc208c9 has been merged. 👍

nulltoken · 2014-03-29T11:49:38Z

@yorah What should we do this one?

nulltoken · 2014-06-15T12:10:27Z

@yorah What should we do this one?

ping?

nulltoken · 2015-01-21T13:57:54Z

@yorah Thanks for the rebase. However, could you please just take care of fixing the following errors?

"C:\projects\libgit2sharp\LibGit2Sharp.sln" (default target) (1) ->
"C:\projects\libgit2sharp\LibGit2Sharp.Tests\LibGit2Sharp.Tests.csproj" (default target) (3) ->
(CoreCompile target) -> 
  StatusFixture.cs(453,38): error CS0029: Cannot implicitly convert type 'string' to 'LibGit2Sharp.Repository' [C:\projects\libgit2sharp\LibGit2Sharp.Tests\LibGit2Sharp.Tests.csproj]
  StatusFixture.cs(465,71): error CS0103: The name 'DummySignature' does not exist in the current context [C:\projects\libgit2sharp\LibGit2Sharp.Tests\LibGit2Sharp.Tests.csproj]
  StatusFixture.cs(465,87): error CS0103: The name 'DummySignature' does not exist in the current context [C:\projects\libgit2sharp\LibGit2Sharp.Tests\LibGit2Sharp.Tests.csproj]
  StatusFixture.cs(476,30): error CS1928: 'LibGit2Sharp.Index' does not contain a definition for 'RetrieveStatus' and the best extension method overload 'LibGit2Sharp.RepositoryExtensions.RetrieveStatus(LibGit2Sharp.IRepository)' has some invalid arguments [C:\projects\libgit2sharp\LibGit2Sharp.Tests\LibGit2Sharp.Tests.csproj]
  StatusFixture.cs(476,30): error CS1929: Instance argument: cannot convert from 'LibGit2Sharp.Index' to 'LibGit2Sharp.IRepository' [C:\projects\libgit2sharp\LibGit2Sharp.Tests\LibGit2Sharp.Tests.csproj]

nulltoken · 2015-01-21T14:05:24Z

Fix proposal

diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
index d818873..6bd172a 100644
--- a/LibGit2Sharp.Tests/StatusFixture.cs
+++ b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -445,12 +445,12 @@ FileStatus expectedCamelCasedFileStatus
         [SkippableFact]
         public void RetrievingStatusMustAlwaysBeCaseSensitive()
         {
-            SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
-
             InconclusiveIf(() => IsFileSystemCaseSensitive,
                 "Skipping 'ignorecase = true' test on case-sensitive file system.");

-            using (Repository repo = Repository.Init(scd.DirectoryPath))
+            string repoPath = InitNewRepository();
+
+            using (Repository repo = new Repository(repoPath))
             {
                 repo.Config.Set("core.ignorecase", true);

@@ -462,22 +462,23 @@ public void RetrievingStatusMustAlwaysBeCaseSensitive()

                 Tree treeOld = repo.ObjectDatabase.CreateTree(tdOld);

-                var commit = repo.ObjectDatabase.CreateCommit("blah", DummySignature, DummySignature, treeOld, new Commit[] { });
+                var commit = repo.ObjectDatabase.CreateCommit(
+                    Constants.Signature, Constants.Signature, "blah", treeOld, new Commit[] { }, true);

                 repo.Refs.Add("refs/heads/master", commit.Sha);

                 Assert.Equal(commit, repo.Head.Tip);
             }

-            using (var repo = new Repository(scd.DirectoryPath))
+            using (var repo = new Repository(repoPath))
             {
                 File.WriteAllText(Path.Combine(repo.Info.WorkingDirectory, "a.TxT"), "blah\n");

-                var status = repo.Index.RetrieveStatus();
+                var status = repo.RetrieveStatus();

-                Assert.Equal(FileStatus.Removed, status["a.txt"]);
-                Assert.Equal(FileStatus.Removed, status["A.TXT"]);
-                Assert.Equal(FileStatus.Untracked, status["a.TxT"]);
+                Assert.Equal(FileStatus.Removed, status["a.txt"].State);
+                Assert.Equal(FileStatus.Removed, status["A.TXT"].State);
+                Assert.Equal(FileStatus.Untracked, status["a.TxT"].State);
             }
         }

yorah · 2015-02-02T14:41:14Z

Still failing on Windows (and macosx).

Test output

a.txt is Removed
A.TXT is NonExistent => this is the unexpected behavior, it should be Removed I believe
a.TxT is Untracked

nulltoken · 2015-02-02T14:44:16Z

@yorah Thanks for this.

@arrbee @ethomson Thoughts?

dahlbyk reviewed Mar 18, 2013
View reviewed changes

yorah mentioned this pull request Apr 23, 2013

Support more diff config options and use the config cache more libgit2/libgit2#1499

Merged

5 tasks

nulltoken force-pushed the vNext branch from 49987df to 0e5bfbc Compare October 8, 2014 22:05

Add test for Status case-sensitivity

4da1ab5

nulltoken added Bug libgit2 labels Feb 2, 2015

nulltoken mentioned this pull request Apr 17, 2015

Clarify behavior of index/workdir operations on a case insensitive platforms libgit2/libgit2#1689

Closed

bording closed this Apr 21, 2019

yorah deleted the topic/case-sensistivity-for-treechanges-and-statuses branch April 23, 2019 13:25

Make sure treechanges and statuses are case-sensitive #365

Make sure treechanges and statuses are case-sensitive #365

Uh oh!

Conversation

yorah commented Mar 15, 2013

Uh oh!

yorah commented Mar 15, 2013

Uh oh!

dahlbyk commented Mar 15, 2013

Uh oh!

yorah commented Mar 18, 2013

Uh oh!

dahlbyk Mar 18, 2013

Choose a reason for hiding this comment

Uh oh!

yorah Mar 19, 2013

Choose a reason for hiding this comment

Uh oh!

dahlbyk Mar 19, 2013

Choose a reason for hiding this comment

Uh oh!

nulltoken commented Mar 28, 2013

Uh oh!

yorah commented Mar 28, 2013

Uh oh!

yorah commented Apr 26, 2013

Uh oh!

yorah commented May 6, 2013

Uh oh!

nulltoken commented May 6, 2013

Uh oh!

nulltoken commented Mar 29, 2014

Uh oh!

nulltoken commented Jun 15, 2014

Uh oh!

nulltoken commented Jan 21, 2015

Uh oh!

nulltoken commented Jan 21, 2015

Uh oh!

yorah commented Feb 2, 2015

Uh oh!

nulltoken commented Feb 2, 2015

Uh oh!

Uh oh!