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>

diff --git a/builtin-clean.c b/builtin-clean.c
index ae30d4e76c3e758689464f41a63dda0605d60e9f..6cad8eaf2591c8f7f04c78f5a2162808ae702e25 100644 (file)
--- 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;
        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),
        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 (!ignored)
                setup_standard_excludes(&dir);
 

+       if (prefix)
+               prefix_offset = strlen(prefix);

        pathspec = get_pathspec(prefix, argv);
        read_cache();
 
        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)) {
                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) {
                        } 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) {
                                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 {
                        } 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) {
                        }
                        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) {
                                continue;
                        } else if (!quiet) {

-                               printf("Removing %s\n", ent->name);
+                               printf("Removing %s\n",
+                                      ent->name + prefix_offset);

                        }
                        unlink(ent->name);
                }
                        }
                        unlink(ent->name);
                }