[PATCH 18/20] cat-file: add split_on_whitespace flag
- From
Olga Telezhnaya <olyatelezhnaya@gmail.com>
- Date
- Jan 9, 2018, 13:05 UTC
- Message-ID
- <01020160db067c88-f01ed048-da02-43a7-8b61-db62027911bf-000000@eu-west-1.amazonses.com>
- In-Reply-To
- <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-000000@eu-west-1.amazonses.com>
Add flag to ref_format struct so that we could pass needed info to cat-file.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored by: Jeff King <peff@peff.net> --- builtin/cat-file.c | 1 + ref-filter.c | 4 ++-- ref-filter.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 289912ab1f858..5aac10b9808ff 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -394,6 +394,7 @@ static int batch_objects(struct batch_options *opt) memset(&data, 0, sizeof(data)); opt->format->cat_file_data = &data; opt->format->is_cat = 1; + opt->format->split_on_whitespace = &data.split_on_whitespace; verify_ref_format(opt->format); if (opt->cmdmode) data.split_on_whitespace = 1; diff --git a/ref-filter.c b/ref-filter.c index 4259c9b9cd767..ee27edb2dad56 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -494,8 +494,8 @@ static int parse_ref_filter_atom(const struct ref_format *format, need_tagged = 1; if (!strcmp(valid_atoms[i].name, "symref")) need_symref = 1; - if (is_cat && !strcmp(valid_atoms[i].name, "rest")) - cat_file_info->split_on_whitespace = 1; + if (!strcmp(valid_atoms[i].name, "rest")) + *format->split_on_whitespace = 1; return at; } diff --git a/ref-filter.h b/ref-filter.h index 5ba4724a472f6..3228661414623 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -127,6 +127,7 @@ struct ref_format { */ struct expand_data *cat_file_data; int is_cat; + int *split_on_whitespace; }; #define REF_FORMAT_INIT { NULL, 0, -1 } -- https://github.com/git/git/pull/450