1 files changed, 34 insertions, 0 deletions

diff --git a/git.h b/git.h
index b1e4828..991eaa5 100644
--- a/git.h
+++ b/git.h
@@ -79,96 +79,109 @@ static inline void *xrealloc(void *ptr, size_t size)
         void *ret = realloc(ptr, size);
         if (!ret && !size)
                 ret = realloc(ptr, 1);
         if (!ret)
                 die("Out of memory, realloc failed");
         return ret;
 }
 
 static inline void *xcalloc(size_t nmemb, size_t size)
 {
         void *ret = calloc(nmemb, size);
         if (!ret && (!nmemb || !size))
                 ret = calloc(1, 1);
         if (!ret)
                 die("Out of memory, calloc failed");
         return ret;
 }
 
 static inline ssize_t xread(int fd, void *buf, size_t len)
 {
         ssize_t nr;
         while (1) {
                 nr = read(fd, buf, len);
                 if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
                         continue;
                 return nr;
         }
 }
 
 static inline ssize_t xwrite(int fd, const void *buf, size_t len)
 {
         ssize_t nr;
         while (1) {
                 nr = write(fd, buf, len);
                 if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
                         continue;
                 return nr;
         }
 }
 
 
 
 
 /*
  * from git:cache.h
  */
 
 
+enum object_type {
+        OBJ_NONE = 0,
+        OBJ_COMMIT = 1,
+        OBJ_TREE = 2,
+        OBJ_BLOB = 3,
+        OBJ_TAG = 4,
+        /* 5 for future expansion */
+        OBJ_OFS_DELTA = 6,
+        OBJ_REF_DELTA = 7,
+        OBJ_BAD,
+};
+
+
 /* Convert to/from hex/sha1 representation */
 #define MINIMUM_ABBREV 4
 #define DEFAULT_ABBREV 7
 
 extern const unsigned char null_sha1[20];
 
 extern int sha1_object_info(const unsigned char *, char *, unsigned long *);
 
 extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
 
 extern int get_sha1(const char *str, unsigned char *sha1);
 extern int get_sha1_hex(const char *hex, unsigned char *sha1);
         extern char *sha1_to_hex(const unsigned char *sha1);/* static buffer result! */
 
 static inline int is_null_sha1(const unsigned char *sha1)
 {
         return !memcmp(sha1, null_sha1, 20);
 }
 static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
 {
         return memcmp(sha1, sha2, 20);
 }
 static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
 {
         memcpy(sha_dst, sha_src, 20);
 }
 static inline void hashclr(unsigned char *hash)
 {
         memset(hash, 0, 20);
 }
 
 
 /*
  * from git:grep.h
  */
 
 enum grep_pat_token {
         GREP_PATTERN,
         GREP_PATTERN_HEAD,
         GREP_PATTERN_BODY,
         GREP_AND,
         GREP_OPEN_PAREN,
         GREP_CLOSE_PAREN,
         GREP_NOT,
         GREP_OR,
 };
 
 enum grep_context {
@@ -183,96 +196,98 @@ struct grep_pat {
         enum grep_pat_token token;
         const char *pattern;
         regex_t regexp;
 };
 
 enum grep_expr_node {
         GREP_NODE_ATOM,
         GREP_NODE_NOT,
         GREP_NODE_AND,
         GREP_NODE_OR,
 };
 
 struct grep_opt {
         struct grep_pat *pattern_list;
         struct grep_pat **pattern_tail;
         struct grep_expr *pattern_expression;
         int prefix_length;
         regex_t regexp;
         unsigned linenum:1;
         unsigned invert:1;
         unsigned status_only:1;
         unsigned name_only:1;
         unsigned unmatch_name_only:1;
         unsigned count:1;
         unsigned word_regexp:1;
         unsigned fixed:1;
         unsigned all_match:1;
 #define GREP_BINARY_DEFAULT     0
 #define GREP_BINARY_NOMATCH     1
 #define GREP_BINARY_TEXT        2
         unsigned binary:2;
         unsigned extended:1;
         unsigned relative:1;
         unsigned pathname:1;
         int regflags;
         unsigned pre_context;
         unsigned post_context;
 };
 
 
 extern void compile_grep_patterns(struct grep_opt *opt);
 extern void free_grep_patterns(struct grep_opt *opt);
 
 
 /*
  * from git:object.h 
  */
 
+extern const char *type_names[9];
+
 struct object_list {
         struct object *item;
         struct object_list *next;
 };
 
 struct object_refs {
         unsigned count;
         struct object *base;
         struct object *ref[FLEX_ARRAY]; /* more */
 };
 
 struct object_array {
         unsigned int nr;
         unsigned int alloc;
         struct object_array_entry {
                 struct object *item;
                 const char *name;
         } *objects;
 };
 
 #define TYPE_BITS   3
 #define FLAG_BITS  27
 
 /*
  * The object type is stored in 3 bits.
  */
 struct object {
         unsigned parsed : 1;
         unsigned used : 1;
         unsigned type : TYPE_BITS;
         unsigned flags : FLAG_BITS;
         unsigned char sha1[20];
 };
 
 
 /*
  * from git:tree.h
  */
 
 struct tree {
         struct object object;
         void *buffer;
         unsigned long size;
 };
 
 
 struct tree *lookup_tree(const unsigned char *sha1);
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
@@ -299,96 +314,115 @@ struct commit_list {
 struct commit {
         struct object object;
         void *util;
         unsigned long date;
         struct commit_list *parents;
         struct tree *tree;
         char *buffer;
 };
 
 
 struct commit *lookup_commit(const unsigned char *sha1);
 struct commit *lookup_commit_reference(const unsigned char *sha1);
 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
                                               int quiet);
 
 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
 int parse_commit(struct commit *item);
 
 struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
 
 void free_commit_list(struct commit_list *list);
 
 void sort_by_date(struct commit_list **list);
 
 /* Commit formats */
 enum cmit_fmt {
         CMIT_FMT_RAW,
         CMIT_FMT_MEDIUM,
         CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
         CMIT_FMT_SHORT,
         CMIT_FMT_FULL,
         CMIT_FMT_FULLER,
         CMIT_FMT_ONELINE,
         CMIT_FMT_EMAIL,
 
         CMIT_FMT_UNSPECIFIED,
 };
 
 extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject, int relative_date);
 
 
 typedef void (*topo_sort_set_fn_t)(struct commit*, void *data);
 typedef void* (*topo_sort_get_fn_t)(struct commit*);
 
 
 
 /*
+ * from git:tag.h
+ */
+
+extern const char *tag_type;
+
+struct tag {
+        struct object object;
+        struct object *tagged;
+        char *tag;
+        char *signature; /* not actually implemented */
+};
+
+extern struct tag *lookup_tag(const unsigned char *sha1);
+extern int parse_tag_buffer(struct tag *item, void *data, unsigned long size);
+extern int parse_tag(struct tag *item);
+extern struct object *deref_tag(struct object *, const char *, int);
+
+
+/*
  * from git:diffcore.h
  */
 
 struct diff_filespec {
         unsigned char sha1[20];
         char *path;
         void *data;
         void *cnt_data;
         unsigned long size;
                 int xfrm_flags;          /* for use by the xfrm */
                 unsigned short mode; /* file mode */
         unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
                                   * if false, use the name and read from
                                   * the filesystem.
                                   */
 #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0)
         unsigned should_free : 1; /* data should be free()'ed */
         unsigned should_munmap : 1; /* data should be munmap()'ed */
 };
 
 struct diff_filepair {
         struct diff_filespec *one;
         struct diff_filespec *two;
         unsigned short int score;
         char status; /* M C R N D U (see Documentation/diff-format.txt) */
         unsigned source_stays : 1; /* all of R/C are copies */
         unsigned broken_pair : 1;
         unsigned renamed_pair : 1;
 };
 
 #define DIFF_PAIR_UNMERGED(p) \
         (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
 
 #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)
 
 #define DIFF_PAIR_BROKEN(p) \
         ( (!DIFF_FILE_VALID((p)->one) != !DIFF_FILE_VALID((p)->two)) && \
           ((p)->broken_pair != 0) )
 
 #define DIFF_PAIR_TYPE_CHANGED(p) \
         ((S_IFMT & (p)->one->mode) != (S_IFMT & (p)->two->mode))
 
 #define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
 
 extern void diff_free_filepair(struct diff_filepair *);
 
 extern int diff_unmodified_pair(struct diff_filepair *);