diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:50:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:50:44 -0700 |
commit | fadf96abaa5f42c4bb7b4b5017926779c23d8ef3 (patch) | |
tree | c2999c9aafd8071d01cabfd16d152cd20e437e11 /pathspec.h | |
parent | af226bf01e99043f5f3d8bc09ad302d17e0de757 (diff) | |
parent | 625c3304e200f9bdc05626be1397311faa4962ba (diff) | |
download | git-fadf96abaa5f42c4bb7b4b5017926779c23d8ef3.tar.gz |
Merge branch 'nd/magic-pathspec'
Use "struct pathspec" interface in more places, instead of array of
characters, the latter of which cannot express magic pathspecs
(e.g. ":(icase)makefile" that matches both Makefile and makefile).
* nd/magic-pathspec:
add: lift the pathspec magic restriction on "add -p"
pathspec: catch prepending :(prefix) on pathspec with short magic
Diffstat (limited to 'pathspec.h')
-rw-r--r-- | pathspec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pathspec.h b/pathspec.h index 04b632fa33..944baeb622 100644 --- a/pathspec.h +++ b/pathspec.h @@ -14,7 +14,7 @@ PATHSPEC_GLOB | \ PATHSPEC_ICASE) -#define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */ +#define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */ struct pathspec { const char **_raw; /* get_pathspec() result, not freed by free_pathspec() */ |