undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean: convert to use parse_pathspec

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2013-07-14 15:35:37 +07:00 committed by Junio C Hamano
parent 8f4f8f4579
commit 893d839970
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/clean.c
View File

@ -13,6 +13,7 @@
#include "refs.h" #include "refs.h"
#include "string-list.h" #include "string-list.h"
#include "quote.h" #include "quote.h"
#include "pathspec.h"
static int force = -1; /* unset */ static int force = -1; /* unset */
@ -150,7 +151,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
int rm_flags = REMOVE_DIR_KEEP_NESTED_GIT; int rm_flags = REMOVE_DIR_KEEP_NESTED_GIT;
struct strbuf directory = STRBUF_INIT; struct strbuf directory = STRBUF_INIT;
struct dir_struct dir; struct dir_struct dir;
static const char **pathspec; struct pathspec pathspec;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct string_list exclude_list = STRING_LIST_INIT_NODUP; struct string_list exclude_list = STRING_LIST_INIT_NODUP;
struct exclude_list *el; struct exclude_list *el;
@ -209,9 +210,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
for (i = 0; i < exclude_list.nr; i++) for (i = 0; i < exclude_list.nr; i++)
add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1)); add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1));
pathspec = get_pathspec(prefix, argv); parse_pathspec(&pathspec, 0,
PATHSPEC_PREFER_CWD,
prefix, argv);
fill_directory(&dir, pathspec); fill_directory(&dir, pathspec.raw);
for (i = 0; i < dir.nr; i++) { for (i = 0; i < dir.nr; i++) {
struct dir_entry *ent = dir.entries[i]; struct dir_entry *ent = dir.entries[i];
@ -246,9 +249,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (lstat(ent->name, &st)) if (lstat(ent->name, &st))
continue; continue;
if (pathspec) if (pathspec.nr)
matches = match_pathspec(pathspec, ent->name, len, matches = match_pathspec_depth(&pathspec, ent->name,
0, NULL); len, 0, NULL);
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
strbuf_addstr(&directory, ent->name); strbuf_addstr(&directory, ent->name);
@ -262,7 +265,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
} }
strbuf_reset(&directory); strbuf_reset(&directory);
} else { } else {
if (pathspec && !matches) if (pathspec.nr && !matches)
continue; continue;
res = dry_run ? 0 : unlink(ent->name); res = dry_run ? 0 : unlink(ent->name);
if (res) { if (res) {