[Re-sending, as the Git mailing list seems to have decided to silently
drop this patch, I cannot see it on public-inbox.org, at least]

From: Johannes Schindelin <johannes.schinde...@gmx.de>

On a case-insensitive filesystem, such as HFS+ or NTFS, it is possible
that the idea Bash has of the current directory differs in case from
what Git thinks it is. That's totally okay, though, and we should not
expect otherwise.

On Windows, for example, when you call

        cd C:\GIT-SDK-64

in a PowerShell and there exists a directory called `C:\git-sdk-64`, the
current directory will be reported in all upper-case. Even in a Bash
that you might call from that PowerShell. Git, however, will have
normalized this via `GetFinalPathByHandle()`, and the expectation in
t0001 that the recorded gitdir will match what `pwd` says will be
violated.

Let's address this by forcing the comparison to be case-insensitive when
`core.ignoreCase` is `true`.

Reported by Jameson Miller.

Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
 t/t0001-init.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 42a263cada..68f713884f 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -307,10 +307,22 @@ test_expect_success 'init prefers command line to 
GIT_DIR' '
        test_path_is_missing otherdir/refs
 '

+downcase_on_case_insensitive_fs () {
+       test true = "$(git config --get --type=bool core.ignorecase)" ||
+       return 0
+
+       for f
+       do
+               tr A-Z a-z <"$f" >"$f".downcased &&
+               mv -f "$f".downcased "$f" || return 1
+       done
+}
+
 test_expect_success 'init with separate gitdir' '
        rm -rf newdir &&
        git init --separate-git-dir realgitdir newdir &&
        echo "gitdir: $(pwd)/realgitdir" >expected &&
+       downcase_on_case_insensitive_fs expected newdir/.git &&
        test_cmp expected newdir/.git &&
        test_path_is_dir realgitdir/refs
 '
@@ -365,6 +377,7 @@ test_expect_success 're-init to update git link' '
        git init --separate-git-dir ../surrealgitdir
        ) &&
        echo "gitdir: $(pwd)/surrealgitdir" >expected &&
+       downcase_on_case_insensitive_fs expected newdir/.git &&
        test_cmp expected newdir/.git &&
        test_path_is_dir surrealgitdir/refs &&
        test_path_is_missing realgitdir/refs
@@ -378,6 +391,7 @@ test_expect_success 're-init to move gitdir' '
        git init --separate-git-dir ../realgitdir
        ) &&
        echo "gitdir: $(pwd)/realgitdir" >expected &&
+       downcase_on_case_insensitive_fs expected newdir/.git &&
        test_cmp expected newdir/.git &&
        test_path_is_dir realgitdir/refs
 '
--
gitgitgadget

Reply via email to