From: Nguyễn Thái Ngọc Duy Date: Mon, 15 Oct 2012 06:24:36 +0000 (+0700) Subject: exclude: fix a bug in prefix compare optimization X-Git-Tag: v1.8.1-rc0~80^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a3ea4d7199870595eb3a264c4b41e725b4417bc2?ds=inline;hp=--cc exclude: fix a bug in prefix compare optimization When "namelen" becomes zero at this stage, we have matched the fixed part, but whether it actually matches the pattern still depends on the pattern in "exclude". As demonstrated in t3001, path "three/a.3" exists and it matches the "three/a.3" part in pattern "three/a.3[abc]", but that does not mean a true match. Don't be too optimistic and let fnmatch() do the job. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- a3ea4d7199870595eb3a264c4b41e725b4417bc2 diff --git a/dir.c b/dir.c index d9b5561466..22d0b7b726 100644 --- a/dir.c +++ b/dir.c @@ -585,7 +585,7 @@ int excluded_from_list(const char *pathname, namelen -= prefix; } - if (!namelen || !fnmatch_icase(exclude, name, FNM_PATHNAME)) + if (!fnmatch_icase(exclude, name, FNM_PATHNAME)) return to_exclude; } return -1; /* undecided */ diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh index c8fe978267..dc2f0458fd 100755 --- a/t/t3001-ls-files-others-exclude.sh +++ b/t/t3001-ls-files-others-exclude.sh @@ -214,4 +214,10 @@ test_expect_success 'subdirectory ignore (l1)' ' test_cmp expect actual ' +test_expect_success 'pattern matches prefix completely' ' + : >expect && + git ls-files -i -o --exclude "/three/a.3[abc]" >actual && + test_cmp expect actual +' + test_done