diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:12 -0700 |
| commit | 5480861c24b6f5830c2301ae2f50e21ef3cdeaf2 (patch) | |
| tree | 4b3ede0c2f1e4e01541aadc45eb74136b5221994 /builtin | |
| parent | Merge branch 'jc/checkout-reflog-fix' into maint (diff) | |
| parent | fast-export: quote paths in output (diff) | |
| download | tgif-5480861c24b6f5830c2301ae2f50e21ef3cdeaf2.tar.xz | |
Merge branch 'jk/fast-export-quote-path' into maint
* jk/fast-export-quote-path:
fast-export: quote paths in output
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-export.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index daf19451ba..48bd5e6a80 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -16,6 +16,7 @@ #include "string-list.h" #include "utf8.h" #include "parse-options.h" +#include "quote.h" static const char *fast_export_usage[] = { "git fast-export [rev-list-opts]", @@ -178,6 +179,15 @@ static int depth_first(const void *a_, const void *b_) return (a->status == 'R') - (b->status == 'R'); } +static void print_path(const char *path) +{ + int need_quote = quote_c_style(path, NULL, NULL, 0); + if (need_quote) + quote_c_style(path, NULL, stdout, 0); + else + printf("%s", path); +} + static void show_filemodify(struct diff_queue_struct *q, struct diff_options *options, void *data) { @@ -195,13 +205,18 @@ static void show_filemodify(struct diff_queue_struct *q, switch (q->queue[i]->status) { case DIFF_STATUS_DELETED: - printf("D %s\n", spec->path); + printf("D "); + print_path(spec->path); + putchar('\n'); break; case DIFF_STATUS_COPIED: case DIFF_STATUS_RENAMED: - printf("%c \"%s\" \"%s\"\n", q->queue[i]->status, - ospec->path, spec->path); + printf("%c ", q->queue[i]->status); + print_path(ospec->path); + putchar(' '); + print_path(spec->path); + putchar('\n'); if (!hashcmp(ospec->sha1, spec->sha1) && ospec->mode == spec->mode) @@ -216,13 +231,15 @@ static void show_filemodify(struct diff_queue_struct *q, * output the SHA-1 verbatim. */ if (no_data || S_ISGITLINK(spec->mode)) - printf("M %06o %s %s\n", spec->mode, - sha1_to_hex(spec->sha1), spec->path); + printf("M %06o %s ", spec->mode, + sha1_to_hex(spec->sha1)); else { struct object *object = lookup_object(spec->sha1); - printf("M %06o :%d %s\n", spec->mode, - get_object_mark(object), spec->path); + printf("M %06o :%d ", spec->mode, + get_object_mark(object)); } + print_path(spec->path); + putchar('\n'); break; default: |