diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 15:35:59 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:56:09 -0700 |
| commit | 9a0872744315da67db3c81eb9270751e31fcc8f5 (patch) | |
| tree | 92cd78dc92a8f8f482592e05f678e4a069c0fe33 /merge-recursive.c | |
| parent | bd1928df1d1cc6a10a7b275694d3504d9a041fae (diff) | |
| download | git-9a0872744315da67db3c81eb9270751e31fcc8f5.tar.gz | |
remove init_pathspec() in favor of parse_pathspec()
While at there, move free_pathspec() to pathspec.c
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ea9dbd307c..8395b9b08a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -297,7 +297,7 @@ static int get_files_dirs(struct merge_options *o, struct tree *tree) { int n; struct pathspec match_all; - init_pathspec(&match_all, NULL); + memset(&match_all, 0, sizeof(match_all)); if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o)) return 0; n = o->current_file_set.nr + o->current_directory_set.nr; |