blob: 221cdaa34b826bc160048567ffdf4872e1b37c47 [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;
Derrick Stolee177722b2018-04-10 08:56:05 -040039 uint32_t graph_pos;
Derrick Stolee83073cc2018-04-25 14:37:55 +000040 uint32_t generation;
Nguyễn Thái Ngọc Duy25f859f2018-05-11 19:20:54 +020041 unsigned int index;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070042};
43
Linus Torvalds60ab26d2005-09-15 14:43:17 -070044extern int save_commit_buffer;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070045extern const char *commit_type;
46
Linus Torvaldsca135e72007-04-16 16:05:10 -070047/* While we can decorate any object with a name, it's only used for commits.. */
Linus Torvaldsca135e72007-04-16 16:05:10 -070048struct name_decoration {
49 struct name_decoration *next;
Nazri Ramliyeb3005e2010-06-19 09:37:33 +080050 int type;
Jeff King2e3dfb22014-08-26 06:24:20 -040051 char name[FLEX_ARRAY];
Linus Torvaldsca135e72007-04-16 16:05:10 -070052};
53
Jeff King662174d2014-08-26 06:23:36 -040054enum decoration_type {
55 DECORATION_NONE = 0,
56 DECORATION_REF_LOCAL,
57 DECORATION_REF_REMOTE,
58 DECORATION_REF_TAG,
59 DECORATION_REF_STASH,
60 DECORATION_REF_HEAD,
61 DECORATION_GRAFTED,
62};
63
64void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
Jeff King2608c242014-08-26 06:23:54 -040065const struct name_decoration *get_name_decoration(const struct object *obj);
Jeff King662174d2014-08-26 06:23:36 -040066
Stefan Bellerbacf1682018-06-28 18:22:10 -070067struct commit *lookup_commit(struct repository *r, const struct object_id *oid);
Stefan Beller1f6c72f2018-06-28 18:22:22 -070068struct commit *lookup_commit_reference(struct repository *r,
69 const struct object_id *oid);
Stefan Bellerd9a05e72018-06-28 18:22:21 -070070struct commit *lookup_commit_reference_gently(struct repository *r,
Stefan Beller21e1ee82018-06-28 18:21:57 -070071 const struct object_id *oid,
Junio C Hamanof76412e2005-08-21 02:51:10 -070072 int quiet);
Pat Notza6fa5992010-11-02 13:59:07 -060073struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070074
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100075/*
brian m. carlsonbc832662017-05-06 22:10:10 +000076 * Look up object named by "oid", dereference tag as necessary,
77 * get a commit and return it. If "oid" does not dereference to
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100078 * a commit, use ref_name to report an error and die.
79 */
brian m. carlsonbc832662017-05-06 22:10:10 +000080struct 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 +100081
Stefan Bellerfd8030c2018-06-28 18:22:13 -070082int 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 -080083int repo_parse_commit_internal(struct repository *r, struct commit *item,
84 int quiet_on_missing, int use_commit_graph);
85int repo_parse_commit_gently(struct repository *r,
86 struct commit *item,
87 int quiet_on_missing);
88static inline int repo_parse_commit(struct repository *r, struct commit *item)
Jeff King9cc2b072015-06-01 05:56:26 -040089{
Stefan Beller9e5252a2018-11-13 16:12:50 -080090 return repo_parse_commit_gently(r, item, 0);
Jeff King9cc2b072015-06-01 05:56:26 -040091}
Ævar Arnfjörð Bjarmason43d35612019-03-25 13:08:33 +010092
93static inline int parse_commit_no_graph(struct commit *commit)
94{
95 return repo_parse_commit_internal(the_repository, commit, 0, 0);
96}
97
Stefan Beller9e5252a2018-11-13 16:12:50 -080098#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
99#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
100#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
101#define parse_commit(item) repo_parse_commit(the_repository, item)
102#endif
103
Jeff King7059dcc2013-10-24 04:52:36 -0400104void parse_commit_or_die(struct commit *item);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700105
Stefan Beller65ea9d42018-06-28 18:22:15 -0700106struct buffer_slab;
107struct buffer_slab *allocate_commit_buffer_slab(void);
108void free_commit_buffer_slab(struct buffer_slab *bs);
109
Jeff King0fb370d2014-06-12 18:05:37 -0400110/*
Jeff King66c28272014-06-10 17:40:14 -0400111 * Associate an object buffer with the commit. The ownership of the
112 * memory is handed over to the commit, and must be free()-able.
113 */
Stefan Beller1a40fc42018-06-28 18:22:16 -0700114void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
Jeff King66c28272014-06-10 17:40:14 -0400115
116/*
Jeff King152ff1c2014-06-10 17:40:39 -0400117 * Get any cached object buffer associated with the commit. Returns NULL
118 * if none. The resulting memory should not be freed.
119 */
Stefan Beller4ff7e5c2018-06-28 18:22:17 -0700120const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -0400121
122/*
123 * Get the commit's object contents, either from cache or by reading the object
124 * from disk. The resulting memory should not be modified, and must be given
125 * to unuse_commit_buffer when the caller is done.
126 */
Stefan Beller07de3fd2018-11-13 16:12:57 -0800127const void *repo_get_commit_buffer(struct repository *r,
128 const struct commit *,
129 unsigned long *size);
130#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
131#define get_commit_buffer(c, s) repo_get_commit_buffer(the_repository, c, s)
132#endif
Jeff King152ff1c2014-06-10 17:40:39 -0400133
134/*
Elijah Newren15beaaa2019-11-05 17:07:23 +0000135 * Tell the commit subsystem that we are done with a particular commit buffer.
Jeff King152ff1c2014-06-10 17:40:39 -0400136 * The commit and buffer should be the input and return value, respectively,
137 * from an earlier call to get_commit_buffer. The buffer may or may not be
138 * freed by this call; callers should not access the memory afterwards.
139 */
Stefan Beller70315372018-11-13 16:12:58 -0800140void repo_unuse_commit_buffer(struct repository *r,
141 const struct commit *,
142 const void *buffer);
143#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
144#define unuse_commit_buffer(c, b) repo_unuse_commit_buffer(the_repository, c, b)
145#endif
Jeff King152ff1c2014-06-10 17:40:39 -0400146
147/*
Jeff King0fb370d2014-06-12 18:05:37 -0400148 * Free any cached object buffer associated with the commit.
149 */
Stefan Beller6a7895f2018-12-14 16:09:40 -0800150void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
Jeff King0fb370d2014-06-12 18:05:37 -0400151
Nguyễn Thái Ngọc Duy301b8c72019-04-16 16:33:19 +0700152struct tree *repo_get_commit_tree(struct repository *, const struct commit *);
153#define get_commit_tree(c) repo_get_commit_tree(the_repository, c)
Derrick Stolee5bb03de2018-04-06 19:09:34 +0000154struct object_id *get_commit_tree_oid(const struct commit *);
155
Jeff King0fb370d2014-06-12 18:05:37 -0400156/*
Stefan Beller14ba97f2018-05-15 14:48:42 -0700157 * Release memory related to a commit, including the parent list and
158 * any cached object buffer.
159 */
Stefan Beller6a7895f2018-12-14 16:09:40 -0800160void release_commit_memory(struct parsed_object_pool *pool, struct commit *c);
Stefan Beller14ba97f2018-05-15 14:48:42 -0700161
162/*
Jeff King0fb370d2014-06-12 18:05:37 -0400163 * Disassociate any cached object buffer from the commit, but do not free it.
164 * The buffer (or NULL, if none) is returned.
165 */
Jeff King8597ea32014-06-10 17:44:13 -0400166const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
Jeff King0fb370d2014-06-12 18:05:37 -0400167
Christian Couder11af2aa2010-07-22 15:18:30 +0200168/* Find beginning and length of commit subject. */
169int find_commit_subject(const char *commit_buffer, const char **subject);
170
Thiago Farina47e44ed2010-11-26 23:58:14 -0200171struct commit_list *commit_list_insert(struct commit *item,
172 struct commit_list **list);
René Scharfe89b5f1d2012-04-25 22:35:27 +0200173struct commit_list **commit_list_append(struct commit *commit,
174 struct commit_list **next);
Miklos Vajna65319472008-06-27 18:21:55 +0200175unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-26 23:58:14 -0200176struct commit_list *commit_list_insert_by_date(struct commit *item,
177 struct commit_list **list);
178void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700179
Thomas Rast53d00b32013-07-31 22:13:20 +0200180/* Shallow copy of the input list */
181struct commit_list *copy_commit_list(struct commit_list *list);
182
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700183void free_commit_list(struct commit_list *list);
184
René Scharfe6d167fd2017-03-01 12:37:07 +0100185struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
186
Denton Liu55454422019-04-29 04:28:14 -0400187int has_non_ascii(const char *text);
188const char *logmsg_reencode(const struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400189 char **commit_encoding,
190 const char *output_encoding);
Stefan Beller424510e2018-11-13 16:12:59 -0800191const char *repo_logmsg_reencode(struct repository *r,
192 const struct commit *commit,
193 char **commit_encoding,
194 const char *output_encoding);
195#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
196#define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out)
197#endif
198
Denton Liu55454422019-04-29 04:28:14 -0400199const char *skip_blank_lines(const char *msg);
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);
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800211
Junio C Hamano08f704f2013-06-06 16:07:14 -0700212
213enum rev_sort_order {
214 REV_SORT_IN_GRAPH_ORDER = 0,
Junio C Hamano81c6b382013-06-07 10:35:54 -0700215 REV_SORT_BY_COMMIT_DATE,
216 REV_SORT_BY_AUTHOR_DATE
Junio C Hamano08f704f2013-06-06 16:07:14 -0700217};
218
Jon Seymourab580ac2005-07-07 02:39:34 +1000219/*
220 * Performs an in-place topological sort of list supplied.
221 *
Jon Seymourab580ac2005-07-07 02:39:34 +1000222 * invariant of resulting list is:
223 * a reachable from b => ord(b) < ord(a)
Junio C Hamano08f704f2013-06-06 16:07:14 -0700224 * sort_order further specifies:
225 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
226 * chain together.
227 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
Jon Seymourab580ac2005-07-07 02:39:34 +1000228 */
Junio C Hamano08f704f2013-06-06 16:07:14 -0700229void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
Junio C Hamano5040f172006-04-06 23:58:51 -0700230
231struct commit_graft {
brian m. carlson7683e2e2015-03-13 23:39:34 +0000232 struct object_id oid;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100233 int nr_parent; /* < 0 if shallow commit */
brian m. carlson7683e2e2015-03-13 23:39:34 +0000234 struct object_id parent[FLEX_ARRAY]; /* more */
Junio C Hamano5040f172006-04-06 23:58:51 -0700235};
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700236typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
Junio C Hamano5040f172006-04-06 23:58:51 -0700237
Patryk Obara9a934032017-08-18 20:33:12 +0200238struct commit_graft *read_graft_line(struct strbuf *line);
Brandon Williamsa3b78e82018-05-17 15:51:48 -0700239int register_commit_graft(struct repository *r, struct commit_graft *, int);
Derrick Stolee20fd6d52018-08-20 18:24:30 +0000240void prepare_commit_graft(struct repository *r);
Stefan Bellerb9dbddf2018-05-17 15:51:54 -0700241struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
Junio C Hamano5040f172006-04-06 23:58:51 -0700242
Pratik Karki103148a2018-09-04 15:00:08 -0700243struct commit *get_fork_point(const char *refname, struct commit *commit);
244
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +0200245/* largest positive number a signed 32-bit integer can contain */
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +0700246#define INFINITE_DEPTH 0x7fffffff
247
brian m. carlson910650d2017-03-31 01:40:00 +0000248struct oid_array;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700249struct ref;
Denton Liu55454422019-04-29 04:28:14 -0400250int register_shallow(struct repository *r, const struct object_id *oid);
251int unregister_shallow(const struct object_id *oid);
252int for_each_commit_graft(each_commit_graft_fn, void *);
253int is_repository_shallow(struct repository *r);
254struct commit_list *get_shallow_commits(struct object_array *heads,
Denton Liuad6dad02019-04-29 04:28:23 -0400255 int depth, int shallow_flag, int not_shallow_flag);
Denton Liu55454422019-04-29 04:28:14 -0400256struct commit_list *get_shallow_commits_by_rev_list(
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700257 int ac, const char **av, int shallow_flag, int not_shallow_flag);
Denton Liu55454422019-04-29 04:28:14 -0400258void set_alternate_shallow_file(struct repository *r, const char *path, int override);
259int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
Denton Liuad6dad02019-04-29 04:28:23 -0400260 const struct oid_array *extra);
Denton Liu55454422019-04-29 04:28:14 -0400261void setup_alternate_shallow(struct lock_file *shallow_lock,
Denton Liuad6dad02019-04-29 04:28:23 -0400262 const char **alternate_shallow_file,
263 const struct oid_array *extra);
Denton Liu55454422019-04-29 04:28:14 -0400264const char *setup_temporary_shallow(const struct oid_array *extra);
265void advertise_shallow_grafts(int);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100266
Jonathan Tan1e7d4402019-03-26 12:31:20 -0700267/*
268 * Initialize with prepare_shallow_info() or zero-initialize (equivalent to
269 * prepare_shallow_info with a NULL oid_array).
270 */
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700271struct shallow_info {
brian m. carlson910650d2017-03-31 01:40:00 +0000272 struct oid_array *shallow;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700273 int *ours, nr_ours;
274 int *theirs, nr_theirs;
brian m. carlson910650d2017-03-31 01:40:00 +0000275 struct oid_array *ref;
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700276
277 /* for receive-pack */
278 uint32_t **used_shallow;
279 int *need_reachability_test;
280 int *reachable;
281 int *shallow_ref;
282 struct commit **commits;
283 int nr_commits;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700284};
285
Denton Liu55454422019-04-29 04:28:14 -0400286void prepare_shallow_info(struct shallow_info *, struct oid_array *);
287void clear_shallow_info(struct shallow_info *);
288void remove_nonexistent_theirs_shallow(struct shallow_info *);
289void assign_shallow_commits_to_refs(struct shallow_info *info,
Denton Liuad6dad02019-04-29 04:28:23 -0400290 uint32_t **used,
291 int *ref_status);
Denton Liu55454422019-04-29 04:28:14 -0400292int delayed_reachability_test(struct shallow_info *si, int c);
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700293#define PRUNE_SHOW_ONLY 1
294#define PRUNE_QUICK 2
Denton Liu55454422019-04-29 04:28:14 -0400295void prune_shallow(unsigned options);
Karsten Blees6aa30852014-07-12 02:00:06 +0200296extern struct trace_key trace_shallow;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700297
Denton Liu55454422019-04-29 04:28:14 -0400298int interactive_add(int argc, const char **argv, const char *prefix, int patch);
299int run_add_interactive(const char *revision, const char *patch_mode,
Denton Liuad6dad02019-04-29 04:28:23 -0400300 const struct pathspec *pathspec);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400301
Junio C Hamano5231c632011-11-07 16:21:32 -0800302struct commit_extra_header {
303 struct commit_extra_header *next;
304 char *key;
305 char *value;
306 size_t len;
307};
308
Denton Liu55454422019-04-29 04:28:14 -0400309void append_merge_tag_headers(struct commit_list *parents,
Denton Liuad6dad02019-04-29 04:28:23 -0400310 struct commit_extra_header ***tail);
Junio C Hamano5231c632011-11-07 16:21:32 -0800311
Denton Liu55454422019-04-29 04:28:14 -0400312int commit_tree(const char *msg, size_t msg_len,
Denton Liuad6dad02019-04-29 04:28:23 -0400313 const struct object_id *tree,
314 struct commit_list *parents, struct object_id *ret,
315 const char *author, const char *sign_commit);
Junio C Hamano5231c632011-11-07 16:21:32 -0800316
Denton Liu55454422019-04-29 04:28:14 -0400317int commit_tree_extended(const char *msg, size_t msg_len,
Denton Liuad6dad02019-04-29 04:28:23 -0400318 const struct object_id *tree,
319 struct commit_list *parents,
320 struct object_id *ret, const char *author,
321 const char *sign_commit,
322 struct commit_extra_header *);
Junio C Hamano5231c632011-11-07 16:21:32 -0800323
Denton Liu55454422019-04-29 04:28:14 -0400324struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -0800325
Denton Liu55454422019-04-29 04:28:14 -0400326void free_commit_extra_headers(struct commit_extra_header *extra);
Jeff King40d52ff2010-04-01 20:05:23 -0400327
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400328/*
329 * Search the commit object contents given by "msg" for the header "key".
330 * Returns a pointer to the start of the header contents, or NULL. The length
331 * of the header, up to the first newline, is returned via out_len.
332 *
333 * Note that some headers (like mergetag) may be multi-line. It is the caller's
334 * responsibility to parse further in this case!
335 */
Denton Liu55454422019-04-29 04:28:14 -0400336const char *find_commit_header(const char *msg, const char *key,
Denton Liuad6dad02019-04-29 04:28:23 -0400337 size_t *out_len);
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400338
Christian Couder8c384582014-11-09 10:23:41 +0100339/* Find the end of the log message, the right place for a new trailer. */
Denton Liu55454422019-04-29 04:28:14 -0400340size_t ignore_non_trailer(const char *buf, size_t len);
Christian Couder8c384582014-11-09 10:23:41 +0100341
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200342typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
Denton Liuad6dad02019-04-29 04:28:23 -0400343 void *cb_data);
Christian Couder063da622014-07-07 08:35:37 +0200344
Denton Liu55454422019-04-29 04:28:14 -0400345int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
Christian Couder063da622014-07-07 08:35:37 +0200346
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800347struct merge_remote_desc {
348 struct object *obj; /* the named object, could be a tag */
René Scharfe5447a762016-08-13 14:21:27 +0200349 char name[FLEX_ARRAY];
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800350};
Denton Liu55454422019-04-29 04:28:14 -0400351struct merge_remote_desc *merge_remote_util(struct commit *);
352void set_merge_remote_desc(struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400353 const char *name, struct object *obj);
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800354
355/*
356 * Given "name" from the command line to merge, find the commit object
357 * and return it, while storing merge_remote_desc in its ->util field,
358 * to allow callers to tell if we are told to merge a tag.
359 */
360struct commit *get_merge_parent(const char *name);
361
Denton Liu55454422019-04-29 04:28:14 -0400362int parse_signed_commit(const struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400363 struct strbuf *message, struct strbuf *signature);
Denton Liu55454422019-04-29 04:28:14 -0400364int remove_signature(struct strbuf *buf);
Christian Couder0b05ab62014-07-19 17:01:12 +0200365
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200366/*
Sebastian Götteeb307ae2013-03-31 18:02:46 +0200367 * Check the signature of the given commit. The result of the check is stored
368 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
369 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
370 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
371 * sig->signer and sig->key.
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200372 */
Denton Liu55454422019-04-29 04:28:14 -0400373int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200374
Derrick Stolee5284fc52018-11-01 13:46:21 +0000375/* record author-date for each commit object */
376struct author_date_slab;
377void record_author_date(struct author_date_slab *author_date,
378 struct commit *commit);
379
380int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);
Junio C Hamano6d2035e2018-11-18 18:23:54 +0900381
Jeff Kingedc4d472018-11-06 02:50:17 -0500382/*
383 * Verify a single commit with check_commit_signature() and die() if it is not
384 * a good signature. This isn't really suitable for general use, but is a
385 * helper to implement consistent logic for pull/merge --verify-signatures.
386 */
387void verify_merge_signature(struct commit *commit, int verbose);
388
Jeff King727377f2013-07-02 02:21:48 -0400389int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
Derrick Stolee3afc6792018-05-01 12:47:11 +0000390int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
Jeff King727377f2013-07-02 02:21:48 -0400391
Benoit Pierre15048f82014-03-18 11:00:53 +0100392LAST_ARG_MUST_BE_NULL
Denton Liub199d712019-04-29 04:28:20 -0400393int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
Benoit Pierre15048f82014-03-18 11:00:53 +0100394
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700395#endif /* COMMIT_H */