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-log.c | |
| parent | fbe3d87e5fcef2e0fff41c3b0589331c889dfb59 (diff) | |
| parent | 66035a6b3d629b546daef3784f5351d58f4f17b1 (diff) | |
| download | git-597388f6a1c18a117904c307c20542d8a79a1fcd.tar.gz | |
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-log.c')
| -rw-r--r-- | builtin-log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c index f43790cbce..1c9f7d02a8 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -89,8 +89,8 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix) static int show_object(const unsigned char *sha1, int suppress_header) { unsigned long size; - char type[20]; - char *buf = read_sha1_file(sha1, type, &size); + enum object_type type; + char *buf = read_sha1_file(sha1, &type, &size); int offset = 0; if (!buf) |