From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon, 15 Feb 2016 09:03:36 +0000 (+0700)
Subject: dir.c: fix match_pathname()
X-Git-Tag: v2.8.0-rc0~29^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a60ea8fb66945a886ea53fd3f41e61cc5fb3201e?ds=inline;hp=--cc

dir.c: fix match_pathname()

Given the pattern "1/2/3/4" and the path "1/2/3/4/f", the pattern
prefix is "1/2/3/4". We will compare and remove the prefix from both
pattern and path and come to this code

/*
* If the whole pattern did not have a wildcard,
* then our prefix match is all we need; we
* do not need to call fnmatch at all.
*/
if (!patternlen && !namelen)
return 1;

where patternlen is zero (full pattern consumed) and the remaining
path in "name" is "/f". We fail to realize it's matched in this case
and fall back to fnmatch(), which also fails to catch it. Fix it.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

a60ea8fb66945a886ea53fd3f41e61cc5fb3201e
diff --git a/dir.c b/dir.c
index f0b6d0a3ea..bcaafac404 100644
--- a/dir.c
+++ b/dir.c
@@ -878,7 +878,7 @@ int match_pathname(const char *pathname, int pathlen,
 		 * then our prefix match is all we need; we
 		 * do not need to call fnmatch at all.
 		 */
-		if (!patternlen && !namelen)
+		if (!patternlen && (!namelen || *name == '/'))
 			return 1;
 	}