aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-27 03:34:06 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 15:27:51 -0700
commit36e4d74a210ba618e1520f11ce7fc2f8baec5bb8 (patch)
treebbcd071ad589fe301eb7246ede689f8cd9839080 /diff.c
parentc4584ae3fd7cd595a638a07dfd853e9d2745e930 (diff)
downloadgit-36e4d74a210ba618e1520f11ce7fc2f8baec5bb8.tar.gz
git-36e4d74a210ba618e1520f11ce7fc2f8baec5bb8.tar.xz
[PATCH] Enhance sha1_file_size() into sha1_object_info()
This lets us eliminate one use of map_sha1_file() outside sha1_file.c, to bring us one step closer to the packed GIT. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 5cb340ca0..a72029058 100644
--- a/diff.c
+++ b/diff.c
@@ -425,7 +425,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
s->size = e->size;
return 0;
}
- if (!sha1_file_size(s->sha1, &s->size))
+ if (!sha1_object_info(s->sha1, type, &s->size))
locate_size_cache(s->sha1, 0, s->size);
}
else {