diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-02 16:32:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-02 16:32:48 (GMT) |
| commit | c7eb614c5cc4b265a53421354020634f92fc2d59 (patch) | |
| tree | 8456be562fa7ff3bf5708673b5a2607834437a4e /builtin/cat-file.c | |
| parent | 304852fc77847e649c746db95e9c4675c03ee567 (diff) | |
| parent | 062aeee8aa426468817c5bea96d781289b272ced (diff) | |
| download | git-c7eb614c5cc4b265a53421354020634f92fc2d59.zip git-c7eb614c5cc4b265a53421354020634f92fc2d59.tar.gz git-c7eb614c5cc4b265a53421354020634f92fc2d59.tar.bz2 | |
Merge branch 'jk/cat-file-batch-optim'
* jk/cat-file-batch-optim:
Revert "cat-file: split --batch input lines on whitespace"
Diffstat (limited to 'builtin/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 163ce6c..4253460 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -119,7 +119,6 @@ struct expand_data { enum object_type type; unsigned long size; unsigned long disk_size; - const char *rest; /* * If mark_query is true, we do not expand anything, but rather @@ -164,9 +163,6 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len, data->info.disk_sizep = &data->disk_size; else strbuf_addf(sb, "%lu", data->disk_size); - } else if (is_atom("rest", atom, len)) { - if (!data->mark_query && data->rest) - strbuf_addstr(sb, data->rest); } else die("unknown format element: %.*s", len, atom); } @@ -277,21 +273,7 @@ static int batch_objects(struct batch_options *opt) warn_on_object_refname_ambiguity = 0; while (strbuf_getline(&buf, stdin, '\n') != EOF) { - char *p; - int error; - - /* - * Split at first whitespace, tying off the beginning of the - * string and saving the remainder (or NULL) in data.rest. - */ - p = strpbrk(buf.buf, " \t"); - if (p) { - while (*p && strchr(" \t", *p)) - *p++ = '\0'; - } - data.rest = p; - - error = batch_one_object(buf.buf, opt, &data); + int error = batch_one_object(buf.buf, opt, &data); if (error) return error; } |