blob: 5d58be0017a8eb26cd3f58c1e3b0b610f684beba [file] [log] [blame]
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -07001#ifndef COMMIT_H
2#define COMMIT_H
3
4#include "object.h"
5#include "tree.h"
Pierre Habouzit674d1722007-09-10 12:35:06 +02006#include "strbuf.h"
Linus Torvaldsca135e72007-04-16 16:05:10 -07007#include "decorate.h"
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02008#include "gpg-interface.h"
Jeff Kinga9080472013-07-03 03:08:22 -04009#include "string-list.h"
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070010
11struct commit_list {
12 struct commit *item;
13 struct commit_list *next;
14};
15
16struct commit {
17 struct object object;
Linus Torvaldsd3ff6f52006-06-17 18:26:18 -070018 void *util;
Jeff King96c4f4a2013-04-09 02:52:56 -040019 unsigned int index;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070020 unsigned long date;
21 struct commit_list *parents;
22 struct tree *tree;
23};
24
Linus Torvalds60ab26d2005-09-15 14:43:17 -070025extern int save_commit_buffer;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070026extern const char *commit_type;
27
Linus Torvaldsca135e72007-04-16 16:05:10 -070028/* While we can decorate any object with a name, it's only used for commits.. */
Linus Torvaldsca135e72007-04-16 16:05:10 -070029struct name_decoration {
30 struct name_decoration *next;
Nazri Ramliyeb3005e2010-06-19 09:37:33 +080031 int type;
Jeff King2e3dfb22014-08-26 06:24:20 -040032 char name[FLEX_ARRAY];
Linus Torvaldsca135e72007-04-16 16:05:10 -070033};
34
Jeff King662174d2014-08-26 06:23:36 -040035enum decoration_type {
36 DECORATION_NONE = 0,
37 DECORATION_REF_LOCAL,
38 DECORATION_REF_REMOTE,
39 DECORATION_REF_TAG,
40 DECORATION_REF_STASH,
41 DECORATION_REF_HEAD,
42 DECORATION_GRAFTED,
43};
44
45void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
Jeff King2608c242014-08-26 06:23:54 -040046const struct name_decoration *get_name_decoration(const struct object *obj);
Jeff King662174d2014-08-26 06:23:36 -040047
Jason McMullan5d6ccf52005-06-03 11:05:39 -040048struct commit *lookup_commit(const unsigned char *sha1);
49struct commit *lookup_commit_reference(const unsigned char *sha1);
Junio C Hamanof76412e2005-08-21 02:51:10 -070050struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
51 int quiet);
Pat Notza6fa5992010-11-02 13:59:07 -060052struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070053
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100054/*
55 * Look up object named by "sha1", dereference tag as necessary,
56 * get a commit and return it. If "sha1" does not dereference to
57 * a commit, use ref_name to report an error and die.
58 */
59struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);
60
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 17:52:20 +070061int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
Jeff King9cc2b072015-06-01 05:56:26 -040062int parse_commit_gently(struct commit *item, int quiet_on_missing);
63static inline int parse_commit(struct commit *item)
64{
65 return parse_commit_gently(item, 0);
66}
Jeff King7059dcc2013-10-24 04:52:36 -040067void parse_commit_or_die(struct commit *item);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070068
Jeff King0fb370d2014-06-12 18:05:37 -040069/*
Jeff King66c28272014-06-10 17:40:14 -040070 * Associate an object buffer with the commit. The ownership of the
71 * memory is handed over to the commit, and must be free()-able.
72 */
Jeff King8597ea32014-06-10 17:44:13 -040073void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
Jeff King66c28272014-06-10 17:40:14 -040074
75/*
Jeff King152ff1c2014-06-10 17:40:39 -040076 * Get any cached object buffer associated with the commit. Returns NULL
77 * if none. The resulting memory should not be freed.
78 */
Jeff King8597ea32014-06-10 17:44:13 -040079const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -040080
81/*
82 * Get the commit's object contents, either from cache or by reading the object
83 * from disk. The resulting memory should not be modified, and must be given
84 * to unuse_commit_buffer when the caller is done.
85 */
Jeff King8597ea32014-06-10 17:44:13 -040086const void *get_commit_buffer(const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -040087
88/*
89 * Tell the commit subsytem that we are done with a particular commit buffer.
90 * The commit and buffer should be the input and return value, respectively,
91 * from an earlier call to get_commit_buffer. The buffer may or may not be
92 * freed by this call; callers should not access the memory afterwards.
93 */
94void unuse_commit_buffer(const struct commit *, const void *buffer);
95
96/*
Jeff King0fb370d2014-06-12 18:05:37 -040097 * Free any cached object buffer associated with the commit.
98 */
99void free_commit_buffer(struct commit *);
100
101/*
102 * Disassociate any cached object buffer from the commit, but do not free it.
103 * The buffer (or NULL, if none) is returned.
104 */
Jeff King8597ea32014-06-10 17:44:13 -0400105const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
Jeff King0fb370d2014-06-12 18:05:37 -0400106
Christian Couder11af2aa2010-07-22 15:18:30 +0200107/* Find beginning and length of commit subject. */
108int find_commit_subject(const char *commit_buffer, const char **subject);
109
Thiago Farina47e44ed2010-11-26 23:58:14 -0200110struct commit_list *commit_list_insert(struct commit *item,
111 struct commit_list **list);
René Scharfe89b5f1d2012-04-25 22:35:27 +0200112struct commit_list **commit_list_append(struct commit *commit,
113 struct commit_list **next);
Miklos Vajna65319472008-06-27 18:21:55 +0200114unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-26 23:58:14 -0200115struct commit_list *commit_list_insert_by_date(struct commit *item,
116 struct commit_list **list);
117void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700118
Thomas Rast53d00b32013-07-31 22:13:20 +0200119/* Shallow copy of the input list */
120struct commit_list *copy_commit_list(struct commit_list *list);
121
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700122void free_commit_list(struct commit_list *list);
123
Linus Torvalds000182e2005-06-05 09:02:03 -0700124/* Commit formats */
125enum cmit_fmt {
126 CMIT_FMT_RAW,
127 CMIT_FMT_MEDIUM,
128 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
Linus Torvalds9b66ec02005-06-26 17:50:46 -0700129 CMIT_FMT_SHORT,
130 CMIT_FMT_FULL,
Junio C Hamanoff56fe12005-11-09 22:15:27 -0800131 CMIT_FMT_FULLER,
Junio C Hamanod87449c2005-08-08 22:15:40 -0700132 CMIT_FMT_ONELINE,
Junio C Hamano3eefc182006-04-18 16:45:27 -0700133 CMIT_FMT_EMAIL,
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100134 CMIT_FMT_USERFORMAT,
Junio C Hamano6b9c58f2006-04-15 23:46:36 -0700135
Gary V. Vaughan4b055482010-05-14 09:31:35 +0000136 CMIT_FMT_UNSPECIFIED
Linus Torvalds000182e2005-06-05 09:02:03 -0700137};
138
Jonathan Nieder9cba13c2011-03-16 02:08:34 -0500139struct pretty_print_context {
Jeff King10f2fbf2013-07-03 03:07:48 -0400140 /*
141 * Callers should tweak these to change the behavior of pp_* functions.
142 */
Jeff King6bf13942011-05-26 18:27:49 -0400143 enum cmit_fmt fmt;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200144 int abbrev;
145 const char *subject;
146 const char *after_subject;
Jeff King9553d2b2011-05-26 18:28:17 -0400147 int preserve_subject;
Jeff Kinga5481a62015-06-25 12:55:02 -0400148 struct date_mode date_mode;
Jeff Kingf026c752012-05-04 01:25:18 -0400149 unsigned date_mode_explicit:1;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200150 int need_8bit_cte;
Junio C Hamanoddf333f2012-10-17 18:51:47 -0700151 char *notes_message;
Thomas Rast8f8f5472009-10-19 17:48:10 +0200152 struct reflog_walk_info *reflog_info;
Pat Notz177b29d2010-11-02 13:59:08 -0600153 const char *output_encoding;
Antoine Pelisse0e2913b2013-01-05 22:26:41 +0100154 struct string_list *mailmap;
Junio C Hamano30825172012-12-17 17:56:49 -0500155 int color;
Jeff Kinga9080472013-07-03 03:08:22 -0400156 struct ident_split *from_ident;
Jeff King10f2fbf2013-07-03 03:07:48 -0400157
158 /*
159 * Fields below here are manipulated internally by pp_* functions and
160 * should not be counted on by callers.
161 */
Jeff Kinga9080472013-07-03 03:08:22 -0400162 struct string_list in_body_headers;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200163};
164
Johannes Gilger5b163602010-04-13 22:31:12 +0200165struct userformat_want {
166 unsigned notes:1;
167};
168
Johannes Schindelin28e9cf62009-08-10 18:22:18 +0200169extern int has_non_ascii(const char *text);
Junio C Hamano4da45be2008-04-07 17:11:34 -0700170struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
Jeff Kingb000c592014-06-10 17:39:30 -0400171extern const char *logmsg_reencode(const struct commit *commit,
172 char **commit_encoding,
173 const char *output_encoding);
Junio C Hamano4da45be2008-04-07 17:11:34 -0700174extern void get_commit_format(const char *arg, struct rev_info *);
Ramsay Jonesc8f14442011-04-07 19:26:23 +0100175extern const char *format_subject(struct strbuf *sb, const char *msg,
176 const char *line_separator);
Johannes Gilger5b163602010-04-13 22:31:12 +0200177extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
Jeff Kingb9c7d6e2014-07-29 13:56:48 -0400178extern int commit_format_is_empty(enum cmit_fmt);
Pierre Habouzit674d1722007-09-10 12:35:06 +0200179extern void format_commit_message(const struct commit *commit,
Junio C Hamano7f98ebc2009-10-15 22:59:41 -0700180 const char *format, struct strbuf *sb,
Thomas Rastdd2e7942009-10-19 17:48:08 +0200181 const struct pretty_print_context *context);
Jeff King10f2fbf2013-07-03 03:07:48 -0400182extern void pretty_print_commit(struct pretty_print_context *pp,
Jeff King6bf13942011-05-26 18:27:49 -0400183 const struct commit *commit,
184 struct strbuf *sb);
Jeff King8b8a5372011-05-26 18:27:24 -0400185extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
186 struct strbuf *sb);
Jeff King10f2fbf2013-07-03 03:07:48 -0400187void pp_user_info(struct pretty_print_context *pp,
Jeff King6bf13942011-05-26 18:27:49 -0400188 const char *what, struct strbuf *sb,
189 const char *line, const char *encoding);
Jeff King10f2fbf2013-07-03 03:07:48 -0400190void pp_title_line(struct pretty_print_context *pp,
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500191 const char **msg_p,
192 struct strbuf *sb,
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500193 const char *encoding,
Junio C Hamano267123b2008-03-15 00:09:20 -0700194 int need_8bit_cte);
Jeff King10f2fbf2013-07-03 03:07:48 -0400195void pp_remainder(struct pretty_print_context *pp,
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500196 const char **msg_p,
197 struct strbuf *sb,
198 int indent);
199
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700200
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700201/** Removes the first commit from a list sorted by date, and adds all
202 * of its parents.
203 **/
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700204struct commit *pop_most_recent_commit(struct commit_list **list,
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700205 unsigned int mark);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700206
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +0000207struct commit *pop_commit(struct commit_list **stack);
208
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800209void clear_commit_marks(struct commit *commit, unsigned int mark);
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800210void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
René Scharfe86a0a402011-10-01 18:16:08 +0200211void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800212
Junio C Hamano08f704f2013-06-06 16:07:14 -0700213
214enum rev_sort_order {
215 REV_SORT_IN_GRAPH_ORDER = 0,
Junio C Hamano81c6b382013-06-07 10:35:54 -0700216 REV_SORT_BY_COMMIT_DATE,
217 REV_SORT_BY_AUTHOR_DATE
Junio C Hamano08f704f2013-06-06 16:07:14 -0700218};
219
Jon Seymourab580ac2005-07-07 02:39:34 +1000220/*
221 * Performs an in-place topological sort of list supplied.
222 *
Jon Seymourab580ac2005-07-07 02:39:34 +1000223 * invariant of resulting list is:
224 * a reachable from b => ord(b) < ord(a)
Junio C Hamano08f704f2013-06-06 16:07:14 -0700225 * sort_order further specifies:
226 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
227 * chain together.
228 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
Jon Seymourab580ac2005-07-07 02:39:34 +1000229 */
Junio C Hamano08f704f2013-06-06 16:07:14 -0700230void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
Junio C Hamano5040f172006-04-06 23:58:51 -0700231
232struct commit_graft {
brian m. carlson7683e2e2015-03-13 23:39:34 +0000233 struct object_id oid;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100234 int nr_parent; /* < 0 if shallow commit */
brian m. carlson7683e2e2015-03-13 23:39:34 +0000235 struct object_id parent[FLEX_ARRAY]; /* more */
Junio C Hamano5040f172006-04-06 23:58:51 -0700236};
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700237typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
Junio C Hamano5040f172006-04-06 23:58:51 -0700238
239struct commit_graft *read_graft_line(char *buf, int len);
240int register_commit_graft(struct commit_graft *, int);
Martin Koegler45163382008-02-25 22:46:07 +0100241struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
Junio C Hamano5040f172006-04-06 23:58:51 -0700242
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700243extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
244extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200245extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200246
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700247/* To be used only when object flags after this call no longer matter */
248extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
249
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +0200250/* largest positive number a signed 32-bit integer can contain */
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +0700251#define INFINITE_DEPTH 0x7fffffff
252
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700253struct sha1_array;
254struct ref;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100255extern int register_shallow(const unsigned char *sha1);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100256extern int unregister_shallow(const unsigned char *sha1);
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700257extern int for_each_commit_graft(each_commit_graft_fn, void *);
Junio C Hamanof43117a2007-01-21 22:22:23 -0800258extern int is_repository_shallow(void);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100259extern struct commit_list *get_shallow_commits(struct object_array *heads,
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100260 int depth, int shallow_flag, int not_shallow_flag);
Nguyễn Thái Ngọc Duy069c0532013-12-05 20:02:45 +0700261extern void set_alternate_shallow_file(const char *path, int override);
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700262extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
263 const struct sha1_array *extra);
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700264extern void setup_alternate_shallow(struct lock_file *shallow_lock,
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700265 const char **alternate_shallow_file,
266 const struct sha1_array *extra);
Jeff King0179c942014-02-27 06:25:20 -0500267extern const char *setup_temporary_shallow(const struct sha1_array *extra);
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700268extern void advertise_shallow_grafts(int);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100269
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700270struct shallow_info {
271 struct sha1_array *shallow;
272 int *ours, nr_ours;
273 int *theirs, nr_theirs;
274 struct sha1_array *ref;
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700275
276 /* for receive-pack */
277 uint32_t **used_shallow;
278 int *need_reachability_test;
279 int *reachable;
280 int *shallow_ref;
281 struct commit **commits;
282 int nr_commits;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700283};
284
285extern void prepare_shallow_info(struct shallow_info *, struct sha1_array *);
286extern void clear_shallow_info(struct shallow_info *);
287extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700288extern void assign_shallow_commits_to_refs(struct shallow_info *info,
289 uint32_t **used,
290 int *ref_status);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700291extern int delayed_reachability_test(struct shallow_info *si, int c);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700292extern void prune_shallow(int show_only);
Karsten Blees6aa30852014-07-12 02:00:06 +0200293extern struct trace_key trace_shallow;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700294
Jake Goulding7fcdb362009-01-26 09:13:24 -0500295int is_descendant_of(struct commit *, struct commit_list *);
Junio C Hamanoa20efee2012-08-27 14:46:01 -0700296int in_merge_bases(struct commit *, struct commit *);
Junio C Hamano4c4b27e2013-03-04 10:16:42 -0800297int in_merge_bases_many(struct commit *, int, struct commit **);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400298
Conrad Irwinb4bd4662011-05-07 10:58:07 -0700299extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
Thomas Rast46b51392009-08-13 14:29:41 +0200300extern int run_add_interactive(const char *revision, const char *patch_mode,
Nguyễn Thái Ngọc Duy480ca642013-07-14 15:35:50 +0700301 const struct pathspec *pathspec);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400302
Linus Torvalds53b2c822007-11-05 13:22:34 -0800303static inline int single_parent(struct commit *commit)
304{
305 return commit->parents && !commit->parents->next;
306}
307
Junio C Hamano98cf9c32008-06-27 18:22:03 +0200308struct commit_list *reduce_heads(struct commit_list *heads);
309
Junio C Hamano5231c632011-11-07 16:21:32 -0800310struct commit_extra_header {
311 struct commit_extra_header *next;
312 char *key;
313 char *value;
314 size_t len;
315};
316
317extern void append_merge_tag_headers(struct commit_list *parents,
318 struct commit_extra_header ***tail);
319
Jeff King3ffefb52014-06-10 17:36:52 -0400320extern int commit_tree(const char *msg, size_t msg_len,
321 const unsigned char *tree,
Junio C Hamano5231c632011-11-07 16:21:32 -0800322 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-05 17:23:20 -0700323 const char *author, const char *sign_commit);
Junio C Hamano5231c632011-11-07 16:21:32 -0800324
Jeff King3ffefb52014-06-10 17:36:52 -0400325extern int commit_tree_extended(const char *msg, size_t msg_len,
326 const unsigned char *tree,
Junio C Hamano5231c632011-11-07 16:21:32 -0800327 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-05 17:23:20 -0700328 const char *author, const char *sign_commit,
Junio C Hamano5231c632011-11-07 16:21:32 -0800329 struct commit_extra_header *);
330
Junio C Hamanoc871a1d2012-01-05 10:54:14 -0800331extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -0800332
Junio C Hamano5231c632011-11-07 16:21:32 -0800333extern void free_commit_extra_headers(struct commit_extra_header *extra);
Jeff King40d52ff2010-04-01 20:05:23 -0400334
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400335/*
336 * Search the commit object contents given by "msg" for the header "key".
337 * Returns a pointer to the start of the header contents, or NULL. The length
338 * of the header, up to the first newline, is returned via out_len.
339 *
340 * Note that some headers (like mergetag) may be multi-line. It is the caller's
341 * responsibility to parse further in this case!
342 */
343extern const char *find_commit_header(const char *msg, const char *key,
344 size_t *out_len);
345
Christian Couder8c384582014-11-09 10:23:41 +0100346/* Find the end of the log message, the right place for a new trailer. */
347extern int ignore_non_trailer(struct strbuf *sb);
348
Christian Couder063da622014-07-07 08:35:37 +0200349typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
350 void *cb_data);
351
352extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
353
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800354struct merge_remote_desc {
355 struct object *obj; /* the named object, could be a tag */
356 const char *name;
357};
358#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
359
360/*
361 * Given "name" from the command line to merge, find the commit object
362 * and return it, while storing merge_remote_desc in its ->util field,
363 * to allow callers to tell if we are told to merge a tag.
364 */
365struct commit *get_merge_parent(const char *name);
366
Jeff King218aa3a2014-06-13 02:32:11 -0400367extern int parse_signed_commit(const struct commit *commit,
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700368 struct strbuf *message, struct strbuf *signature);
Christian Couder0b05ab62014-07-19 17:01:12 +0200369extern int remove_signature(struct strbuf *buf);
370
Nguyễn Thái Ngọc Duyefc7df42012-10-26 22:53:51 +0700371extern void print_commit_list(struct commit_list *list,
372 const char *format_cur,
373 const char *format_last);
374
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200375/*
Sebastian Götteeb307ae2013-03-31 18:02:46 +0200376 * Check the signature of the given commit. The result of the check is stored
377 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
378 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
379 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
380 * sig->signer and sig->key.
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200381 */
brian m. carlson434060e2015-06-21 23:14:40 +0000382extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200383
Jeff King727377f2013-07-02 02:21:48 -0400384int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
385
Benoit Pierre15048f82014-03-18 11:00:53 +0100386LAST_ARG_MUST_BE_NULL
387extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
388
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700389#endif /* COMMIT_H */