diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-09-28 18:12:18 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 10:49:06 -0700 |
commit | 63ec5e1fecc14b0dd5452f0a2b80641600b03437 (patch) | |
tree | 4ed0dd50aeda7f1a78435548d3932f301cec3411 | |
parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
download | git-js/icase-wt-detection.tar.gz |
setup: fix "inside work tree" detection on case-insensitive filesystemsjs/icase-wt-detection
Git has a config variable to indicate that it is operating on a file
system that is case-insensitive: core.ignoreCase. But the
`dir_inside_of()` function did not respect that. As a result, if Git's
idea of the current working directory disagreed in its upper/lower case
with the `GIT_WORK_TREE` variable (e.g. `C:\test` vs `c:\test`) the
user would be greeted by the error message
fatal: git-am cannot be used without a working tree.
when trying to run a rebase.
This fixes https://github.com/git-for-windows/git/issues/402 (reported by
Daniel Harding).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | dir.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -2030,6 +2030,15 @@ int file_exists(const char *f) return lstat(f, &sb) == 0; } +static int cmp_icase(char a, char b) +{ + if (a == b) + return 0; + if (ignore_case) + return toupper(a) - toupper(b); + return a - b; +} + /* * Given two normalized paths (a trailing slash is ok), if subdir is * outside dir, return -1. Otherwise return the offset in subdir that @@ -2041,7 +2050,7 @@ int dir_inside_of(const char *subdir, const char *dir) assert(dir && subdir && *dir && *subdir); - while (*dir && *subdir && *dir == *subdir) { + while (*dir && *subdir && !cmp_icase(*dir, *subdir)) { dir++; subdir++; offset++; |