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

git-clean: make "Would remove ..." path relative to cwd again

Browse Source 
The rewrite changed the output to use the path relative to the
top of the work tree without a good reason.  This fixes it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-01-03 19:04:37 -08:00
parent 790296fd88
commit 95bf4bd4f7
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
builtin-clean.c
View File

@ -34,6 +34,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
struct dir_struct dir; struct dir_struct dir;
const char *path, *base; const char *path, *base;
static const char **pathspec; static const char **pathspec;
int prefix_offset = 0;
char *seen = NULL; char *seen = NULL;
struct option options[] = { struct option options[] = {
OPT__QUIET(&quiet), OPT__QUIET(&quiet),
@ -71,6 +72,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (!ignored) if (!ignored)
setup_standard_excludes(&dir); setup_standard_excludes(&dir);
if (prefix)
prefix_offset = strlen(prefix);
pathspec = get_pathspec(prefix, argv); pathspec = get_pathspec(prefix, argv);
read_cache(); read_cache();
@ -132,26 +135,32 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
strbuf_addstr(&directory, ent->name); strbuf_addstr(&directory, ent->name);
if (show_only && (remove_directories || matches)) { if (show_only && (remove_directories || matches)) {
printf("Would remove %s\n", directory.buf); printf("Would remove %s\n",
directory.buf + prefix_offset);
} else if (quiet && (remove_directories || matches)) { } else if (quiet && (remove_directories || matches)) {
remove_dir_recursively(&directory, 0); remove_dir_recursively(&directory, 0);
} else if (remove_directories || matches) { } else if (remove_directories || matches) {
printf("Removing %s\n", directory.buf); printf("Removing %s\n",
directory.buf + prefix_offset);
remove_dir_recursively(&directory, 0); remove_dir_recursively(&directory, 0);
} else if (show_only) { } else if (show_only) {
printf("Would not remove %s\n", directory.buf); printf("Would not remove %s\n",
directory.buf + prefix_offset);
} else { } else {
printf("Not removing %s\n", directory.buf); printf("Not removing %s\n",
directory.buf + prefix_offset);
} }
strbuf_reset(&directory); strbuf_reset(&directory);
} else { } else {
if (pathspec && !matches) if (pathspec && !matches)
continue; continue;
if (show_only) { if (show_only) {
printf("Would remove %s\n", ent->name); printf("Would remove %s\n",
ent->name + prefix_offset);
continue; continue;
} else if (!quiet) { } else if (!quiet) {
printf("Removing %s\n", ent->name); printf("Removing %s\n",
ent->name + prefix_offset);
} }
unlink(ent->name); unlink(ent->name);
} }