summaryrefslogtreecommitdiff
path: root/builtin-clean.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-03 19:04:37 -0800
committerJunio C Hamano <gitster@pobox.com>2008-01-03 19:04:37 -0800
commit95bf4bd4f7280312571e642339f3571310d0d660 (patch)
tree0e48d30ed3bbfaa6a378a8ce0af2768e5b74487f /builtin-clean.c
parent790296fd8863d649054096191d33bacbbf5c2115 (diff)
downloadgit-95bf4bd4f7280312571e642339f3571310d0d660.tar.gz
git-clean: make "Would remove ..." path relative to cwd again
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>
Diffstat (limited to 'builtin-clean.c')
-rw-r--r--builtin-clean.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/builtin-clean.c b/builtin-clean.c
index ae30d4e76c..6cad8eaf25 100644
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -34,6 +34,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
struct dir_struct dir;
const char *path, *base;
static const char **pathspec;
+ int prefix_offset = 0;
char *seen = NULL;
struct option options[] = {
OPT__QUIET(&quiet),
@@ -71,6 +72,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (!ignored)
setup_standard_excludes(&dir);
+ if (prefix)
+ prefix_offset = strlen(prefix);
pathspec = get_pathspec(prefix, argv);
read_cache();
@@ -132,26 +135,32 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (S_ISDIR(st.st_mode)) {
strbuf_addstr(&directory, ent->name);
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)) {
remove_dir_recursively(&directory, 0);
} else if (remove_directories || matches) {
- printf("Removing %s\n", directory.buf);
+ printf("Removing %s\n",
+ directory.buf + prefix_offset);
remove_dir_recursively(&directory, 0);
} else if (show_only) {
- printf("Would not remove %s\n", directory.buf);
+ printf("Would not remove %s\n",
+ directory.buf + prefix_offset);
} else {
- printf("Not removing %s\n", directory.buf);
+ printf("Not removing %s\n",
+ directory.buf + prefix_offset);
}
strbuf_reset(&directory);
} else {
if (pathspec && !matches)
continue;
if (show_only) {
- printf("Would remove %s\n", ent->name);
+ printf("Would remove %s\n",
+ ent->name + prefix_offset);
continue;
} else if (!quiet) {
- printf("Removing %s\n", ent->name);
+ printf("Removing %s\n",
+ ent->name + prefix_offset);
}
unlink(ent->name);
}