diff options
| author | Kevin Ballard <kevin@sb.org> | 2008-08-13 15:34:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-13 17:11:03 -0700 |
| commit | ea335b56d44a92b9b8be40b1465d7df65a4f736b (patch) | |
| tree | 8fb43988263fce307dc046d5b4c1cb7d078d0a63 | |
| parent | 9612e74342cfd38c0b83230a2c847cd070599a5a (diff) | |
| download | git-ea335b56d44a92b9b8be40b1465d7df65a4f736b.tar.gz git-ea335b56d44a92b9b8be40b1465d7df65a4f736b.tar.xz | |
Fix escaping of glob special characters in pathspecs
match_one implements an optimized pathspec match where it only uses
fnmatch if it detects glob special characters in the pattern. Unfortunately
it didn't treat \ as a special character, so attempts to escape a glob
special character would fail even though fnmatch() supports it.
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | dir.c | 2 | ||||
| -rwxr-xr-x | t/t3700-add.sh | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -54,7 +54,7 @@ int common_prefix(const char **pathspec) static inline int special_char(unsigned char c1) { - return !c1 || c1 == '*' || c1 == '[' || c1 == '?'; + return !c1 || c1 == '*' || c1 == '[' || c1 == '?' || c1 == '\\'; } /* diff --git a/t/t3700-add.sh b/t/t3700-add.sh index e83fa1f68..fcbc203e7 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -222,4 +222,12 @@ test_expect_success 'git add (add.ignore-errors = false)' ' ! ( git ls-files foo1 | grep foo1 ) ' +test_expect_success 'git add '\''fo\?bar'\'' ignores foobar' ' + git reset --hard && + touch fo\?bar foobar && + git add '\''fo\?bar'\'' && + git ls-files fo\?bar | grep -F fo\?bar && + ! ( git ls-files foobar | grep foobar ) +' + test_done |