aboutsummaryrefslogtreecommitdiffstats
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-28 16:42:27 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-28 16:42:27 -0700
commit40469ee9c6a6f4c85df5520ef719bba3d38a64f0 (patch)
treedc0b54b68c90574a689fef23c5ab26d165f3ee2e /cache.h
parentcf9a113d3526c301b380fbd8a5d3b9d74d322c71 (diff)
downloadgit-40469ee9c6a6f4c85df5520ef719bba3d38a64f0.tar.gz
[PATCH] Rename and extend read_tree_with_tree_or_commit_sha1
This patch renames read_tree_with_tree_or_commit_sha1() to read_object_with_reference() and extends it to automatically dereference not just "commit" objects but "tag" objects. With this patch, you can say e.g.: ls-tree $tag read-tree -m $(merge-base $tag $HEAD) $tag $HEAD diff-cache $tag diff-tree $tag $HEAD Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/cache.h b/cache.h
index 3277d48708..aca98f3ec6 100644
--- a/cache.h
+++ b/cache.h
@@ -143,9 +143,10 @@ extern int error(const char *err, ...);
extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
-extern void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1,
- unsigned long *size,
- unsigned char *tree_sha1_ret);
+extern void *read_object_with_reference(const unsigned char *sha1,
+ const unsigned char *required_type,
+ unsigned long *size,
+ unsigned char *sha1_ret);
static inline void *xmalloc(int size)
{