Case insensitivity support for .gitignore via core.ignorecase

This is especially beneficial when using Windows and Perforce and the git-p4 bridge. Internally, Perforce preserves a given file's full path including its case at the time it was added to the Perforce repository. When syncing a file down via Perforce, missing directories are created, if necessary, using the case as stored with the filename. Unfortunately, two files in the same directory can have differing cases for their respective paths, such as /diRa/file1.c and /DirA/file2.c. Depending on sync order, DirA/ may get created instead of diRa/. It is possible to handle directory names in a case insensitive manner without this patch, but it is highly inconvenient, requiring each character to be specified like so: [Bb][Uu][Ii][Ll][Dd]. With this patch, the gitignore exclusions honor the core.ignorecase=true configuration setting and make the process less error prone. The above is specified like so: Build Signed-off-by: Joshua Jensen <jjensen@workspacewhiz.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Joshua Jensen committed Oct 3, 2010 at 09:56 UTC 10d4b02b9962170e15d1d65b03581ef8bef66e2e

1 file changed +6 -6

dir.c

+6 -6

@@ -390,14 +390,14 @@ int excluded_from_list(const char *pathname,

390 if (x->flags & EXC_FLAG_NODIR) {

391 /* match basename */

392 if (x->flags & EXC_FLAG_NOWILDCARD) {

393 - if (!strcmp(exclude, basename))

393 + if (!strcmp_icase(exclude, basename))

394 return to_exclude;

395 } else if (x->flags & EXC_FLAG_ENDSWITH) {

396 if (x->patternlen - 1 <= pathlen &&

397 - !strcmp(exclude + 1, pathname + pathlen - x->patternlen + 1))

397 + !strcmp_icase(exclude + 1, pathname + pathlen - x->patternlen + 1))

398 return to_exclude;

399 } else {

400 - if (fnmatch(exclude, basename, 0) == 0)

400 + if (fnmatch_icase(exclude, basename, 0) == 0)

401 return to_exclude;

402 }

403 }

@@ -412,14 +412,14 @@ int excluded_from_list(const char *pathname,

412

413 if (pathlen < baselen ||

414 (baselen && pathname[baselen-1] != '/') ||

415 - strncmp(pathname, x->base, baselen))

415 + strncmp_icase(pathname, x->base, baselen))

416 continue;

417

418 if (x->flags & EXC_FLAG_NOWILDCARD) {

419 - if (!strcmp(exclude, pathname + baselen))

419 + if (!strcmp_icase(exclude, pathname + baselen))

420 return to_exclude;

421 } else {

422 - if (fnmatch(exclude, pathname+baselen,

422 + if (fnmatch_icase(exclude, pathname+baselen,

423 FNM_PATHNAME) == 0)

424 return to_exclude;

425 }