blob: f4e7b0158e2595ec203ce4bc0fc14cd95192ab72 [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"
Olga Telezhnayacf394712017-12-12 08:55:35 +000010#include "pretty.h"
Derrick Stolee5284fc52018-11-01 13:46:21 +000011#include "commit-slab.h"
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070012
Derrick Stolee177722b2018-04-10 08:56:05 -040013#define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
Derrick Stolee83073cc2018-04-25 14:37:55 +000014#define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
15#define GENERATION_NUMBER_MAX 0x3FFFFFFF
16#define GENERATION_NUMBER_ZERO 0
Derrick Stolee177722b2018-04-10 08:56:05 -040017
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070018struct commit_list {
19 struct commit *item;
20 struct commit_list *next;
21};
22
Nguyễn Thái Ngọc Duy9d2c9702018-05-19 07:28:31 +020023/*
24 * The size of this struct matters in full repo walk operations like
25 * 'git clone' or 'git gc'. Consider using commit-slab to attach data
26 * to a commit instead of adding new fields here.
27 */
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070028struct commit {
29 struct object object;
Johannes Schindelindddbad72017-04-26 21:29:31 +020030 timestamp_t date;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070031 struct commit_list *parents;
Derrick Stolee7b8a21d2018-04-06 19:09:46 +000032
33 /*
34 * If the commit is loaded from the commit-graph file, then this
Nguyễn Thái Ngọc Duy301b8c72019-04-16 16:33:19 +070035 * member may be NULL. Only access it through repo_get_commit_tree()
Derrick Stolee7b8a21d2018-04-06 19:09:46 +000036 * or get_commit_tree_oid().
37 */
Derrick Stolee891435d2018-04-06 19:09:32 +000038 struct tree *maybe_tree;
Nguyễn Thái Ngọc Duy25f859f2018-05-11 19:20:54 +020039 unsigned int index;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070040};
41
Linus Torvalds60ab26d2005-09-15 14:43:17 -070042extern int save_commit_buffer;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070043extern const char *commit_type;
44
Linus Torvaldsca135e72007-04-16 16:05:10 -070045/* While we can decorate any object with a name, it's only used for commits.. */
Linus Torvaldsca135e72007-04-16 16:05:10 -070046struct name_decoration {
47 struct name_decoration *next;
Nazri Ramliyeb3005e2010-06-19 09:37:33 +080048 int type;
Jeff King2e3dfb22014-08-26 06:24:20 -040049 char name[FLEX_ARRAY];
Linus Torvaldsca135e72007-04-16 16:05:10 -070050};
51
Jeff King662174d2014-08-26 06:23:36 -040052enum decoration_type {
53 DECORATION_NONE = 0,
54 DECORATION_REF_LOCAL,
55 DECORATION_REF_REMOTE,
56 DECORATION_REF_TAG,
57 DECORATION_REF_STASH,
58 DECORATION_REF_HEAD,
59 DECORATION_GRAFTED,
60};
61
62void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
Jeff King2608c242014-08-26 06:23:54 -040063const struct name_decoration *get_name_decoration(const struct object *obj);
Jeff King662174d2014-08-26 06:23:36 -040064
Stefan Bellerbacf1682018-06-28 18:22:10 -070065struct commit *lookup_commit(struct repository *r, const struct object_id *oid);
Stefan Beller1f6c72f2018-06-28 18:22:22 -070066struct commit *lookup_commit_reference(struct repository *r,
67 const struct object_id *oid);
Stefan Bellerd9a05e72018-06-28 18:22:21 -070068struct commit *lookup_commit_reference_gently(struct repository *r,
Stefan Beller21e1ee82018-06-28 18:21:57 -070069 const struct object_id *oid,
Junio C Hamanof76412e2005-08-21 02:51:10 -070070 int quiet);
Pat Notza6fa5992010-11-02 13:59:07 -060071struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070072
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100073/*
brian m. carlsonbc832662017-05-06 22:10:10 +000074 * Look up object named by "oid", dereference tag as necessary,
75 * get a commit and return it. If "oid" does not dereference to
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100076 * a commit, use ref_name to report an error and die.
77 */
brian m. carlsonbc832662017-05-06 22:10:10 +000078struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100079
Stefan Bellerfd8030c2018-06-28 18:22:13 -070080int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph);
Stefan Beller9e5252a2018-11-13 16:12:50 -080081int repo_parse_commit_internal(struct repository *r, struct commit *item,
82 int quiet_on_missing, int use_commit_graph);
83int repo_parse_commit_gently(struct repository *r,
84 struct commit *item,
85 int quiet_on_missing);
86static inline int repo_parse_commit(struct repository *r, struct commit *item)
Jeff King9cc2b072015-06-01 05:56:26 -040087{
Stefan Beller9e5252a2018-11-13 16:12:50 -080088 return repo_parse_commit_gently(r, item, 0);
Jeff King9cc2b072015-06-01 05:56:26 -040089}
Ævar Arnfjörð Bjarmason43d35612019-03-25 13:08:33 +010090
91static inline int parse_commit_no_graph(struct commit *commit)
92{
93 return repo_parse_commit_internal(the_repository, commit, 0, 0);
94}
95
Stefan Beller9e5252a2018-11-13 16:12:50 -080096#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
97#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
Stefan Beller9e5252a2018-11-13 16:12:50 -080098#define parse_commit(item) repo_parse_commit(the_repository, item)
99#endif
100
Jeff King7059dcc2013-10-24 04:52:36 -0400101void parse_commit_or_die(struct commit *item);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700102
Stefan Beller65ea9d42018-06-28 18:22:15 -0700103struct buffer_slab;
104struct buffer_slab *allocate_commit_buffer_slab(void);
105void free_commit_buffer_slab(struct buffer_slab *bs);
106
Jeff King0fb370d2014-06-12 18:05:37 -0400107/*
Jeff King66c28272014-06-10 17:40:14 -0400108 * Associate an object buffer with the commit. The ownership of the
109 * memory is handed over to the commit, and must be free()-able.
110 */
Stefan Beller1a40fc42018-06-28 18:22:16 -0700111void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
Jeff King66c28272014-06-10 17:40:14 -0400112
113/*
Jeff King152ff1c2014-06-10 17:40:39 -0400114 * Get any cached object buffer associated with the commit. Returns NULL
115 * if none. The resulting memory should not be freed.
116 */
Stefan Beller4ff7e5c2018-06-28 18:22:17 -0700117const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -0400118
119/*
120 * Get the commit's object contents, either from cache or by reading the object
121 * from disk. The resulting memory should not be modified, and must be given
122 * to unuse_commit_buffer when the caller is done.
123 */
Stefan Beller07de3fd2018-11-13 16:12:57 -0800124const void *repo_get_commit_buffer(struct repository *r,
125 const struct commit *,
126 unsigned long *size);
127#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
128#define get_commit_buffer(c, s) repo_get_commit_buffer(the_repository, c, s)
129#endif
Jeff King152ff1c2014-06-10 17:40:39 -0400130
131/*
Elijah Newren15beaaa2019-11-05 17:07:23 +0000132 * Tell the commit subsystem that we are done with a particular commit buffer.
Jeff King152ff1c2014-06-10 17:40:39 -0400133 * The commit and buffer should be the input and return value, respectively,
134 * from an earlier call to get_commit_buffer. The buffer may or may not be
135 * freed by this call; callers should not access the memory afterwards.
136 */
Stefan Beller70315372018-11-13 16:12:58 -0800137void repo_unuse_commit_buffer(struct repository *r,
138 const struct commit *,
139 const void *buffer);
140#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
141#define unuse_commit_buffer(c, b) repo_unuse_commit_buffer(the_repository, c, b)
142#endif
Jeff King152ff1c2014-06-10 17:40:39 -0400143
144/*
Jeff King0fb370d2014-06-12 18:05:37 -0400145 * Free any cached object buffer associated with the commit.
146 */
Stefan Beller6a7895f2018-12-14 16:09:40 -0800147void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
Jeff King0fb370d2014-06-12 18:05:37 -0400148
Nguyễn Thái Ngọc Duy301b8c72019-04-16 16:33:19 +0700149struct tree *repo_get_commit_tree(struct repository *, const struct commit *);
150#define get_commit_tree(c) repo_get_commit_tree(the_repository, c)
Derrick Stolee5bb03de2018-04-06 19:09:34 +0000151struct object_id *get_commit_tree_oid(const struct commit *);
152
Jeff King0fb370d2014-06-12 18:05:37 -0400153/*
Stefan Beller14ba97f2018-05-15 14:48:42 -0700154 * Release memory related to a commit, including the parent list and
155 * any cached object buffer.
156 */
Stefan Beller6a7895f2018-12-14 16:09:40 -0800157void release_commit_memory(struct parsed_object_pool *pool, struct commit *c);
Stefan Beller14ba97f2018-05-15 14:48:42 -0700158
159/*
Jeff King0fb370d2014-06-12 18:05:37 -0400160 * Disassociate any cached object buffer from the commit, but do not free it.
161 * The buffer (or NULL, if none) is returned.
162 */
Jeff King8597ea32014-06-10 17:44:13 -0400163const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
Jeff King0fb370d2014-06-12 18:05:37 -0400164
Christian Couder11af2aa2010-07-22 15:18:30 +0200165/* Find beginning and length of commit subject. */
166int find_commit_subject(const char *commit_buffer, const char **subject);
167
Thiago Farina47e44ed2010-11-26 23:58:14 -0200168struct commit_list *commit_list_insert(struct commit *item,
169 struct commit_list **list);
Derrick Stolee597b2c32020-12-08 17:04:13 -0500170int commit_list_contains(struct commit *item,
171 struct commit_list *list);
René Scharfe89b5f1d2012-04-25 22:35:27 +0200172struct commit_list **commit_list_append(struct commit *commit,
173 struct commit_list **next);
Miklos Vajna65319472008-06-27 18:21:55 +0200174unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-26 23:58:14 -0200175struct commit_list *commit_list_insert_by_date(struct commit *item,
176 struct commit_list **list);
177void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700178
Thomas Rast53d00b32013-07-31 22:13:20 +0200179/* Shallow copy of the input list */
180struct commit_list *copy_commit_list(struct commit_list *list);
181
Elijah Newrenb0ca1202020-12-16 22:27:59 +0000182/* Modify list in-place to reverse it, returning new head; list will be tail */
183struct commit_list *reverse_commit_list(struct commit_list *list);
184
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700185void free_commit_list(struct commit_list *list);
186
René Scharfe6d167fd2017-03-01 12:37:07 +0100187struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
188
Denton Liu55454422019-04-29 04:28:14 -0400189int has_non_ascii(const char *text);
190const char *logmsg_reencode(const struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400191 char **commit_encoding,
192 const char *output_encoding);
Stefan Beller424510e2018-11-13 16:12:59 -0800193const char *repo_logmsg_reencode(struct repository *r,
194 const struct commit *commit,
195 char **commit_encoding,
196 const char *output_encoding);
197#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
198#define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out)
199#endif
200
Denton Liu55454422019-04-29 04:28:14 -0400201const char *skip_blank_lines(const char *msg);
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700202
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700203/** Removes the first commit from a list sorted by date, and adds all
204 * of its parents.
205 **/
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700206struct commit *pop_most_recent_commit(struct commit_list **list,
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700207 unsigned int mark);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700208
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +0000209struct commit *pop_commit(struct commit_list **stack);
210
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800211void clear_commit_marks(struct commit *commit, unsigned int mark);
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800212void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800213
Junio C Hamano08f704f2013-06-06 16:07:14 -0700214
215enum rev_sort_order {
216 REV_SORT_IN_GRAPH_ORDER = 0,
Junio C Hamano81c6b382013-06-07 10:35:54 -0700217 REV_SORT_BY_COMMIT_DATE,
218 REV_SORT_BY_AUTHOR_DATE
Junio C Hamano08f704f2013-06-06 16:07:14 -0700219};
220
Jon Seymourab580ac2005-07-07 02:39:34 +1000221/*
222 * Performs an in-place topological sort of list supplied.
223 *
Jon Seymourab580ac2005-07-07 02:39:34 +1000224 * invariant of resulting list is:
225 * a reachable from b => ord(b) < ord(a)
Junio C Hamano08f704f2013-06-06 16:07:14 -0700226 * sort_order further specifies:
227 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
228 * chain together.
229 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
Jon Seymourab580ac2005-07-07 02:39:34 +1000230 */
Junio C Hamano08f704f2013-06-06 16:07:14 -0700231void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
Junio C Hamano5040f172006-04-06 23:58:51 -0700232
233struct commit_graft {
brian m. carlson7683e2e2015-03-13 23:39:34 +0000234 struct object_id oid;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100235 int nr_parent; /* < 0 if shallow commit */
brian m. carlson7683e2e2015-03-13 23:39:34 +0000236 struct object_id parent[FLEX_ARRAY]; /* more */
Junio C Hamano5040f172006-04-06 23:58:51 -0700237};
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700238typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
Junio C Hamano5040f172006-04-06 23:58:51 -0700239
Patryk Obara9a934032017-08-18 20:33:12 +0200240struct commit_graft *read_graft_line(struct strbuf *line);
Taylor Blau183df642020-04-30 15:11:28 -0600241/* commit_graft_pos returns an index into r->parsed_objects->grafts. */
242int commit_graft_pos(struct repository *r, const unsigned char *sha1);
Brandon Williamsa3b78e82018-05-17 15:51:48 -0700243int register_commit_graft(struct repository *r, struct commit_graft *, int);
Derrick Stolee20fd6d52018-08-20 18:24:30 +0000244void prepare_commit_graft(struct repository *r);
Stefan Bellerb9dbddf2018-05-17 15:51:54 -0700245struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
Junio C Hamano5040f172006-04-06 23:58:51 -0700246
Pratik Karki103148a2018-09-04 15:00:08 -0700247struct commit *get_fork_point(const char *refname, struct commit *commit);
248
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +0200249/* largest positive number a signed 32-bit integer can contain */
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +0700250#define INFINITE_DEPTH 0x7fffffff
251
brian m. carlson910650d2017-03-31 01:40:00 +0000252struct oid_array;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700253struct ref;
Denton Liu55454422019-04-29 04:28:14 -0400254int for_each_commit_graft(each_commit_graft_fn, void *);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100255
Jeff Kinge885a842020-09-30 08:28:18 -0400256int interactive_add(const char **argv, const char *prefix, int patch);
Denton Liu55454422019-04-29 04:28:14 -0400257int run_add_interactive(const char *revision, const char *patch_mode,
Denton Liuad6dad02019-04-29 04:28:23 -0400258 const struct pathspec *pathspec);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400259
Junio C Hamano5231c632011-11-07 16:21:32 -0800260struct commit_extra_header {
261 struct commit_extra_header *next;
262 char *key;
263 char *value;
264 size_t len;
265};
266
Denton Liu55454422019-04-29 04:28:14 -0400267void append_merge_tag_headers(struct commit_list *parents,
Denton Liuad6dad02019-04-29 04:28:23 -0400268 struct commit_extra_header ***tail);
Junio C Hamano5231c632011-11-07 16:21:32 -0800269
Denton Liu55454422019-04-29 04:28:14 -0400270int commit_tree(const char *msg, size_t msg_len,
Denton Liuad6dad02019-04-29 04:28:23 -0400271 const struct object_id *tree,
272 struct commit_list *parents, struct object_id *ret,
273 const char *author, const char *sign_commit);
Junio C Hamano5231c632011-11-07 16:21:32 -0800274
Denton Liu55454422019-04-29 04:28:14 -0400275int commit_tree_extended(const char *msg, size_t msg_len,
Denton Liuad6dad02019-04-29 04:28:23 -0400276 const struct object_id *tree,
Phillip Woode8cbe212020-08-17 18:40:01 +0100277 struct commit_list *parents, struct object_id *ret,
278 const char *author, const char *committer,
279 const char *sign_commit, struct commit_extra_header *);
Junio C Hamano5231c632011-11-07 16:21:32 -0800280
Denton Liu55454422019-04-29 04:28:14 -0400281struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -0800282
Denton Liu55454422019-04-29 04:28:14 -0400283void free_commit_extra_headers(struct commit_extra_header *extra);
Jeff King40d52ff2010-04-01 20:05:23 -0400284
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400285/*
286 * Search the commit object contents given by "msg" for the header "key".
287 * Returns a pointer to the start of the header contents, or NULL. The length
288 * of the header, up to the first newline, is returned via out_len.
289 *
290 * Note that some headers (like mergetag) may be multi-line. It is the caller's
291 * responsibility to parse further in this case!
292 */
Denton Liu55454422019-04-29 04:28:14 -0400293const char *find_commit_header(const char *msg, const char *key,
Denton Liuad6dad02019-04-29 04:28:23 -0400294 size_t *out_len);
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400295
Christian Couder8c384582014-11-09 10:23:41 +0100296/* Find the end of the log message, the right place for a new trailer. */
Denton Liu55454422019-04-29 04:28:14 -0400297size_t ignore_non_trailer(const char *buf, size_t len);
Christian Couder8c384582014-11-09 10:23:41 +0100298
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200299typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
Denton Liuad6dad02019-04-29 04:28:23 -0400300 void *cb_data);
Christian Couder063da622014-07-07 08:35:37 +0200301
Denton Liu55454422019-04-29 04:28:14 -0400302int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
Christian Couder063da622014-07-07 08:35:37 +0200303
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800304struct merge_remote_desc {
305 struct object *obj; /* the named object, could be a tag */
René Scharfe5447a762016-08-13 14:21:27 +0200306 char name[FLEX_ARRAY];
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800307};
Denton Liu55454422019-04-29 04:28:14 -0400308struct merge_remote_desc *merge_remote_util(struct commit *);
309void set_merge_remote_desc(struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400310 const char *name, struct object *obj);
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800311
312/*
313 * Given "name" from the command line to merge, find the commit object
314 * and return it, while storing merge_remote_desc in its ->util field,
315 * to allow callers to tell if we are told to merge a tag.
316 */
317struct commit *get_merge_parent(const char *name);
318
Denton Liu55454422019-04-29 04:28:14 -0400319int parse_signed_commit(const struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400320 struct strbuf *message, struct strbuf *signature);
Denton Liu55454422019-04-29 04:28:14 -0400321int remove_signature(struct strbuf *buf);
Christian Couder0b05ab62014-07-19 17:01:12 +0200322
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200323/*
Sebastian Götteeb307ae2013-03-31 18:02:46 +0200324 * Check the signature of the given commit. The result of the check is stored
325 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
326 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
327 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
328 * sig->signer and sig->key.
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200329 */
Denton Liu55454422019-04-29 04:28:14 -0400330int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200331
Derrick Stolee5284fc52018-11-01 13:46:21 +0000332/* record author-date for each commit object */
333struct author_date_slab;
334void record_author_date(struct author_date_slab *author_date,
335 struct commit *commit);
336
337int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);
Junio C Hamano6d2035e2018-11-18 18:23:54 +0900338
Jeff Kingedc4d472018-11-06 02:50:17 -0500339/*
340 * Verify a single commit with check_commit_signature() and die() if it is not
341 * a good signature. This isn't really suitable for general use, but is a
342 * helper to implement consistent logic for pull/merge --verify-signatures.
Hans Jerry Illikainen54887b42019-12-27 13:55:57 +0000343 *
344 * The check_trust parameter is meant for backward-compatibility. The GPG
345 * interface verifies key trust with a default trust level that is below the
346 * default trust level for merge operations. Its value should be non-zero if
347 * the user hasn't set a minimum trust level explicitly in their configuration.
348 *
349 * If the user has set a minimum trust level, then that value should be obeyed
350 * and check_trust should be zero, even if the configured trust level is below
351 * the default trust level for merges.
Jeff Kingedc4d472018-11-06 02:50:17 -0500352 */
Hans Jerry Illikainen54887b42019-12-27 13:55:57 +0000353void verify_merge_signature(struct commit *commit, int verbose,
354 int check_trust);
Jeff Kingedc4d472018-11-06 02:50:17 -0500355
Jeff King727377f2013-07-02 02:21:48 -0400356int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
Derrick Stolee3afc6792018-05-01 12:47:11 +0000357int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
Jeff King727377f2013-07-02 02:21:48 -0400358
Benoit Pierre15048f82014-03-18 11:00:53 +0100359LAST_ARG_MUST_BE_NULL
Denton Liub199d712019-04-29 04:28:20 -0400360int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
Benoit Pierre15048f82014-03-18 11:00:53 +0100361
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700362#endif /* COMMIT_H */