diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:14 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:15 -0800 |
commit | fe9ec8bdf65657c11f08f8858bb2a707bdf7aafe (patch) | |
tree | e8134f8c702030414bc600aeaa414680fc04717c /pathspec.h | |
parent | e51058ffc5baf06cf77d13a962c4e0684052db96 (diff) | |
parent | 27ec42826e9e5ffa9bcdf0208c1399f62b78c7fb (diff) | |
download | git-fe9ec8bdf65657c11f08f8858bb2a707bdf7aafe.tar.gz git-fe9ec8bdf65657c11f08f8858bb2a707bdf7aafe.tar.xz |
Merge branch 'bw/pathspec-cleanup'
Code clean-up in the pathspec API.
* bw/pathspec-cleanup:
pathspec: rename prefix_pathspec to init_pathspec_item
pathspec: small readability changes
pathspec: create strip submodule slash helpers
pathspec: create parse_element_magic helper
pathspec: create parse_long_magic function
pathspec: create parse_short_magic function
pathspec: factor global magic into its own function
pathspec: simpler logic to prefix original pathspec elements
pathspec: always show mnemonic and name in unsupported_magic
pathspec: remove unused variable from unsupported_magic
pathspec: copy and free owned memory
pathspec: remove the deprecated get_pathspec function
ls-tree: convert show_recursive to use the pathspec struct interface
dir: convert fill_directory to use the pathspec struct interface
dir: remove struct path_simplify
mv: remove use of deprecated 'get_pathspec()'
Diffstat (limited to 'pathspec.h')
-rw-r--r-- | pathspec.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pathspec.h b/pathspec.h index 59809e479..49fd823dd 100644 --- a/pathspec.h +++ b/pathspec.h @@ -19,15 +19,14 @@ #define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */ struct pathspec { - const char **_raw; /* get_pathspec() result, not freed by clear_pathspec() */ int nr; unsigned int has_wildcard:1; unsigned int recursive:1; unsigned magic; int max_depth; struct pathspec_item { - const char *match; - const char *original; + char *match; + char *original; unsigned magic; int len, prefix; int nowildcard_len; |