summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-02 16:29:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-08-02 16:29:30 (GMT)
commit062aeee8aa426468817c5bea96d781289b272ced (patch)
tree4bdb3b965febcbe6008cc22a7470660735d3acba /builtin/cat-file.c
parentd099b7173dabdeeb1f339151ac2169b3a91bf631 (diff)
downloadgit-062aeee8aa426468817c5bea96d781289b272ced.zip
git-062aeee8aa426468817c5bea96d781289b272ced.tar.gz
git-062aeee8aa426468817c5bea96d781289b272ced.tar.bz2
Revert "cat-file: split --batch input lines on whitespace"
This reverts commit c334b87b30c1464a1ab563fe1fb8de5eaf0e5bac; the update assumed that people only used the command to read from "rev-list --objects" output, whose lines begin with a 40-hex object name followed by a whitespace, but it turns out that scripts feed random extended SHA-1 expressions (e.g. "HEAD:$pathname") in which a whitespace has to be kept.
Diffstat (limited to 'builtin/cat-file.c')
-rw-r--r--builtin/cat-file.c20
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;
}