global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 03:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge GIT v1.5.2-rc2

Browse Source
This commit is contained in:
Johannes Sixt
2007-05-19 23:24:49 +02:00
parent f2d16ce2fd 9159afbfce
commit 6340a16e95
33 changed files with 454 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
diff.c
View File

@@ -1573,14 +1573,15 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
enum object_type type;
struct sha1_size_cache *e;
if (size_only && use_size_cache &&
(e = locate_size_cache(s->sha1, 1, 0)) != NULL) {
s->size = e->size;
return 0;
}
if (size_only) {
e = locate_size_cache(s->sha1, 1, 0);
if (e) {
s->size = e->size;
return 0;
}
type = sha1_object_info(s->sha1, &s->size);
if (type < 0)
if (use_size_cache && 0 < type)
locate_size_cache(s->sha1, 0, s->size);
}
else {