author | Lars Hjemli <hjemli@gmail.com> | 2008-09-15 20:41:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-09-15 20:41:25 (UTC) |
commit | a30453a5d3f6db4d6e055da2112343e054e7e7d5 (patch) (unidiff) | |
tree | e8713318ee4c1d605eb02ae469cf22f0d1cc4df1 /cgit.h | |
parent | 91fd1eca07f9e48109e8acebc0a92dc4b12ecb50 (diff) | |
parent | a608ff7ba371c2dddf9274de3a438bf74e2560f7 (diff) | |
download | cgit-a30453a5d3f6db4d6e055da2112343e054e7e7d5.zip cgit-a30453a5d3f6db4d6e055da2112343e054e7e7d5.tar.gz cgit-a30453a5d3f6db4d6e055da2112343e054e7e7d5.tar.bz2 |
Merge branch 'lh/parsing'
* lh/parsing:
ui-tag: show the taggers email
parsing.c: be prepared for unexpected content in commit/tag objects
-rw-r--r-- | cgit.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -76,25 +76,25 @@ struct commitinfo { | |||
76 | unsigned long author_date; | 76 | unsigned long author_date; |
77 | char *committer; | 77 | char *committer; |
78 | char *committer_email; | 78 | char *committer_email; |
79 | unsigned long committer_date; | 79 | unsigned long committer_date; |
80 | char *subject; | 80 | char *subject; |
81 | char *msg; | 81 | char *msg; |
82 | char *msg_encoding; | 82 | char *msg_encoding; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | struct taginfo { | 85 | struct taginfo { |
86 | char *tagger; | 86 | char *tagger; |
87 | char *tagger_email; | 87 | char *tagger_email; |
88 | int tagger_date; | 88 | unsigned long tagger_date; |
89 | char *msg; | 89 | char *msg; |
90 | }; | 90 | }; |
91 | 91 | ||
92 | struct refinfo { | 92 | struct refinfo { |
93 | const char *refname; | 93 | const char *refname; |
94 | struct object *object; | 94 | struct object *object; |
95 | union { | 95 | union { |
96 | struct taginfo *tag; | 96 | struct taginfo *tag; |
97 | struct commitinfo *commit; | 97 | struct commitinfo *commit; |
98 | }; | 98 | }; |
99 | }; | 99 | }; |
100 | 100 | ||