Commit 1097dacd by Vicent Martí

Merge pull request #240 from Romain-Geissler/tree-object-type

Tree: Added a function that returns the type of a tree entry.
parents 9b1692eb ff9a4c13
...@@ -146,6 +146,14 @@ GIT_EXTERN(const char *) git_tree_entry_name(const git_tree_entry *entry); ...@@ -146,6 +146,14 @@ GIT_EXTERN(const char *) git_tree_entry_name(const git_tree_entry *entry);
GIT_EXTERN(const git_oid *) git_tree_entry_id(const git_tree_entry *entry); GIT_EXTERN(const git_oid *) git_tree_entry_id(const git_tree_entry *entry);
/** /**
* Get the type of the object pointed by the entry
*
* @param entry a tree entry
* @return the type of the pointed object
*/
GIT_EXTERN(git_otype) git_tree_entry_type(const git_tree_entry *entry);
/**
* Convert a tree entry to the git_object it points too. * Convert a tree entry to the git_object it points too.
* *
* @param object pointer to the converted object * @param object pointer to the converted object
......
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#define GIT_PLATFORM_PATH_SEP '/' #define GIT_PLATFORM_PATH_SEP '/'
#endif #endif
#define S_IFGITLINK 0160000
#define S_ISGITLINK(m) (((m) & S_IFMT) == S_IFGITLINK)
#ifdef GIT_WIN32 #ifdef GIT_WIN32
GIT_INLINE(int) link(const char *GIT_UNUSED(old), const char *GIT_UNUSED(new)) GIT_INLINE(int) link(const char *GIT_UNUSED(old), const char *GIT_UNUSED(new))
{ {
......
...@@ -100,6 +100,18 @@ const git_oid *git_tree_entry_id(const git_tree_entry *entry) ...@@ -100,6 +100,18 @@ const git_oid *git_tree_entry_id(const git_tree_entry *entry)
return &entry->oid; return &entry->oid;
} }
git_otype git_tree_entry_type(const git_tree_entry *entry)
{
assert(entry);
if (S_ISGITLINK(entry->attr))
return GIT_OBJ_COMMIT;
else if (S_ISDIR(entry->attr))
return GIT_OBJ_TREE;
else
return GIT_OBJ_BLOB;
}
int git_tree_entry_2object(git_object **object_out, git_repository *repo, const git_tree_entry *entry) int git_tree_entry_2object(git_object **object_out, git_repository *repo, const git_tree_entry *entry)
{ {
assert(entry && object_out); assert(entry && object_out);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment