summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-28 11:58:27 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-28 11:58:27 -0800
commit597388f6a1c18a117904c307c20542d8a79a1fcd (patch)
tree035f1083845981205f2f73b5db158f1598c89d19 /diff.c
parentfbe3d87e5fcef2e0fff41c3b0589331c889dfb59 (diff)
parent66035a6b3d629b546daef3784f5351d58f4f17b1 (diff)
downloadgit-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 'diff.c')
-rw-r--r--diff.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 5651152a93..e225de2305 100644
--- a/diff.c
+++ b/diff.c
@@ -1436,7 +1436,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
}
}
else {
- char type[20];
+ enum object_type type;
struct sha1_size_cache *e;
if (size_only) {
@@ -1445,11 +1445,12 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
s->size = e->size;
return 0;
}
- if (!sha1_object_info(s->sha1, type, &s->size))
+ type = sha1_object_info(s->sha1, &s->size);
+ if (type < 0)
locate_size_cache(s->sha1, 0, s->size);
}
else {
- s->data = read_sha1_file(s->sha1, type, &s->size);
+ s->data = read_sha1_file(s->sha1, &type, &s->size);
s->should_free = 1;
}
}