diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-28 11:58:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-28 11:58:27 -0800 |
| commit | 597388f6a1c18a117904c307c20542d8a79a1fcd (patch) | |
| tree | 035f1083845981205f2f73b5db158f1598c89d19 /builtin-apply.c | |
| parent | fbe3d87e5fcef2e0fff41c3b0589331c889dfb59 (diff) | |
| parent | 66035a6b3d629b546daef3784f5351d58f4f17b1 (diff) | |
| download | git-597388f6a1c18a117904c307c20542d8a79a1fcd.tar.gz git-597388f6a1c18a117904c307c20542d8a79a1fcd.tar.xz | |
Merge branch 'np/types'
* np/types:
Cleanup check_valid in commit-tree.
make sure enum object_type is signed
get rid of lookup_object_type()
convert object type handling from a string to a number
formalize typename(), and add its reverse type_from_string()
sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
sha1_file.c: cleanup "offset" usage
sha1_file.c: cleanup hdr usage
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index b84d747e3..38f647510 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1912,11 +1912,11 @@ static int apply_binary(struct buffer_desc *desc, struct patch *patch) if (has_sha1_file(sha1)) { /* We already have the postimage */ - char type[10]; + enum object_type type; unsigned long size; free(desc->buffer); - desc->buffer = read_sha1_file(sha1, type, &size); + desc->buffer = read_sha1_file(sha1, &type, &size); if (!desc->buffer) return error("the necessary postimage %s for " "'%s' cannot be read", @@ -1972,8 +1972,8 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry * buf = NULL; if (cached) { if (ce) { - char type[20]; - buf = read_sha1_file(ce->sha1, type, &size); + enum object_type type; + buf = read_sha1_file(ce->sha1, &type, &size); if (!buf) return error("read of %s failed", patch->old_name); |