summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-01-17 00:07:31 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-01-17 00:07:31 (UTC)
commit06c81d6faafff1c80bc9e2302e5b8fea393b775b (patch) (unidiff)
tree29f0e08e98110984299989f7abf80868793ea51d
parent66091f934a2d064ae55095cdc5ae008b43ea60fe (diff)
downloadcgit-06c81d6faafff1c80bc9e2302e5b8fea393b775b.zip
cgit-06c81d6faafff1c80bc9e2302e5b8fea393b775b.tar.gz
cgit-06c81d6faafff1c80bc9e2302e5b8fea393b775b.tar.bz2
Add some more decls from git (cache.h, tag.h)
This is in preparation for extended tag support in cgit Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--git.h34
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
@@ -121,12 +121,25 @@ static inline ssize_t xwrite(int fd, const void *buf, size_t len)
121 121
122/* 122/*
123 * from git:cache.h 123 * from git:cache.h
124 */ 124 */
125 125
126 126
127enum object_type {
128 OBJ_NONE = 0,
129 OBJ_COMMIT = 1,
130 OBJ_TREE = 2,
131 OBJ_BLOB = 3,
132 OBJ_TAG = 4,
133 /* 5 for future expansion */
134 OBJ_OFS_DELTA = 6,
135 OBJ_REF_DELTA = 7,
136 OBJ_BAD,
137};
138
139
127/* Convert to/from hex/sha1 representation */ 140/* Convert to/from hex/sha1 representation */
128#define MINIMUM_ABBREV 4 141#define MINIMUM_ABBREV 4
129#define DEFAULT_ABBREV 7 142#define DEFAULT_ABBREV 7
130 143
131extern const unsigned char null_sha1[20]; 144extern const unsigned char null_sha1[20];
132 145
@@ -225,12 +238,14 @@ extern void free_grep_patterns(struct grep_opt *opt);
225 238
226 239
227/* 240/*
228 * from git:object.h 241 * from git:object.h
229 */ 242 */
230 243
244extern const char *type_names[9];
245
231struct object_list { 246struct object_list {
232 struct object *item; 247 struct object *item;
233 struct object_list *next; 248 struct object_list *next;
234}; 249};
235 250
236struct object_refs { 251struct object_refs {
@@ -341,12 +356,31 @@ extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit
341typedef void (*topo_sort_set_fn_t)(struct commit*, void *data); 356typedef void (*topo_sort_set_fn_t)(struct commit*, void *data);
342typedef void* (*topo_sort_get_fn_t)(struct commit*); 357typedef void* (*topo_sort_get_fn_t)(struct commit*);
343 358
344 359
345 360
346/* 361/*
362 * from git:tag.h
363 */
364
365extern const char *tag_type;
366
367struct tag {
368 struct object object;
369 struct object *tagged;
370 char *tag;
371 char *signature; /* not actually implemented */
372};
373
374extern struct tag *lookup_tag(const unsigned char *sha1);
375extern int parse_tag_buffer(struct tag *item, void *data, unsigned long size);
376extern int parse_tag(struct tag *item);
377extern struct object *deref_tag(struct object *, const char *, int);
378
379
380/*
347 * from git:diffcore.h 381 * from git:diffcore.h
348 */ 382 */
349 383
350struct diff_filespec { 384struct diff_filespec {
351 unsigned char sha1[20]; 385 unsigned char sha1[20];
352 char *path; 386 char *path;