From: Finn Arne Gangstad Date: Tue, 10 Feb 2009 14:20:17 GMT Subject: [PATCH v2] Support "\" in non-wildcard exclusion entries Message-ID: <20090210142017.GA16478@pvv.org> In-Reply-To: "\" was treated differently in exclude rules depending on whether a wildcard match was done. For wildcard rules, "\" was de-escaped in fnmatch, but this was not done for other rules since they used strcmp instead. A file named "#foo" would not be excluded by "\#foo", but would be excluded by "\#foo*". We now treat all rules with "\" as wildcard rules. Another solution could be to de-escape all non-wildcard rules as we read them, but we would have to do the de-escaping exactly as fnmatch does it to avoid inconsistencies. Signed-off-by: Finn Arne Gangstad --- dir.c | 2 +- t/t3003-ls-files-others-escaped-excludes.sh | 37 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) create mode 100755 t/t3003-ls-files-others-escaped-excludes.sh diff --git a/dir.c b/dir.c index cfd1ea5..2245749 100644 --- a/dir.c +++ b/dir.c @@ -137,7 +137,7 @@ int match_pathspec(const char **pathspec, const char *name, int namelen, static int no_wildcard(const char *string) { - return string[strcspn(string, "*?[{")] == '\0'; + return string[strcspn(string, "*?[{\\")] == '\0'; } void add_exclude(const char *string, const char *base, diff --git a/t/t3003-ls-files-others-escaped-excludes.sh b/t/t3003-ls-files-others-escaped-excludes.sh new file mode 100755 index 0000000..bce8741 --- /dev/null +++ b/t/t3003-ls-files-others-escaped-excludes.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# +# Copyright (c) 2009 Finn Arne Gangstad +# + +test_description='git ls-files --others with escaped excludes + +This test tests exclusion patterns with \ in them and makes sure they +are treated correctly and identically both for normal and wildcard rules. +' + +. ./test-lib.sh + +touch \#ignore1 && +touch \#ignore2 && +touch \#hidden && +touch keep + +echo keep > expect + +cat >.gitignore <output && + test_cmp expect output' + +test_done -- 1.6.2.rc0.11.g665ed