blob: fa39202fa6b09837f2a08202bc1f758fa0eac4de [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
Abhishek Kumard7f92782021-01-16 18:11:13 +000014#define GENERATION_NUMBER_INFINITY ((1ULL << 63) - 1)
15#define GENERATION_NUMBER_V1_MAX 0x3FFFFFFF
Derrick Stolee83073cc2018-04-25 14:37:55 +000016#define GENERATION_NUMBER_ZERO 0
Abhishek Kumare8b63002021-01-16 18:11:15 +000017#define GENERATION_NUMBER_V2_OFFSET_MAX ((1ULL << 31) - 1)
Derrick Stolee177722b2018-04-10 08:56:05 -040018
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070019struct commit_list {
20 struct commit *item;
21 struct commit_list *next;
22};
23
Nguyễn Thái Ngọc Duy9d2c9702018-05-19 07:28:31 +020024/*
25 * The size of this struct matters in full repo walk operations like
26 * 'git clone' or 'git gc'. Consider using commit-slab to attach data
27 * to a commit instead of adding new fields here.
28 */
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070029struct commit {
30 struct object object;
Johannes Schindelindddbad72017-04-26 21:29:31 +020031 timestamp_t date;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070032 struct commit_list *parents;
Derrick Stolee7b8a21d2018-04-06 19:09:46 +000033
34 /*
35 * If the commit is loaded from the commit-graph file, then this
Nguyễn Thái Ngọc Duy301b8c72019-04-16 16:33:19 +070036 * member may be NULL. Only access it through repo_get_commit_tree()
Derrick Stolee7b8a21d2018-04-06 19:09:46 +000037 * or get_commit_tree_oid().
38 */
Derrick Stolee891435d2018-04-06 19:09:32 +000039 struct tree *maybe_tree;
Nguyễn Thái Ngọc Duy25f859f2018-05-11 19:20:54 +020040 unsigned int index;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070041};
42
Linus Torvalds60ab26d2005-09-15 14:43:17 -070043extern int save_commit_buffer;
Ævar Arnfjörð Bjarmasonab628582021-08-23 12:44:02 +020044extern int no_graft_file_deprecated_advice;
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
Phillip Woodb8dbfd02022-10-17 13:17:40 +000067/*
68 * Look up commit named by "oid" respecting replacement objects.
69 * Returns NULL if "oid" is not a commit or does not exist.
70 */
71struct commit *lookup_commit_object(struct repository *r, const struct object_id *oid);
72
73/*
74 * Look up commit named by "oid" without replacement objects or
75 * checking for object existence. Returns the requested commit if it
76 * is found in the object cache, NULL if "oid" is in the object cache
77 * but is not a commit and a newly allocated unparsed commit object if
78 * "oid" is not in the object cache.
79 */
Stefan Bellerbacf1682018-06-28 18:22:10 -070080struct commit *lookup_commit(struct repository *r, const struct object_id *oid);
Stefan Beller1f6c72f2018-06-28 18:22:22 -070081struct commit *lookup_commit_reference(struct repository *r,
82 const struct object_id *oid);
Stefan Bellerd9a05e72018-06-28 18:22:21 -070083struct commit *lookup_commit_reference_gently(struct repository *r,
Stefan Beller21e1ee82018-06-28 18:21:57 -070084 const struct object_id *oid,
Junio C Hamanof76412e2005-08-21 02:51:10 -070085 int quiet);
Pat Notza6fa5992010-11-02 13:59:07 -060086struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070087
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100088/*
brian m. carlsonbc832662017-05-06 22:10:10 +000089 * Look up object named by "oid", dereference tag as necessary,
90 * get a commit and return it. If "oid" does not dereference to
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100091 * a commit, use ref_name to report an error and die.
92 */
brian m. carlsonbc832662017-05-06 22:10:10 +000093struct 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 +100094
Stefan Bellerfd8030c2018-06-28 18:22:13 -070095int 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 -080096int repo_parse_commit_internal(struct repository *r, struct commit *item,
97 int quiet_on_missing, int use_commit_graph);
98int repo_parse_commit_gently(struct repository *r,
99 struct commit *item,
100 int quiet_on_missing);
101static inline int repo_parse_commit(struct repository *r, struct commit *item)
Jeff King9cc2b072015-06-01 05:56:26 -0400102{
Stefan Beller9e5252a2018-11-13 16:12:50 -0800103 return repo_parse_commit_gently(r, item, 0);
Jeff King9cc2b072015-06-01 05:56:26 -0400104}
Ævar Arnfjörð Bjarmason43d35612019-03-25 13:08:33 +0100105
Derrick Stoleec4cc0832021-02-01 17:15:03 +0000106static inline int repo_parse_commit_no_graph(struct repository *r,
107 struct commit *commit)
Ævar Arnfjörð Bjarmason43d35612019-03-25 13:08:33 +0100108{
Derrick Stoleec4cc0832021-02-01 17:15:03 +0000109 return repo_parse_commit_internal(r, commit, 0, 0);
Ævar Arnfjörð Bjarmason43d35612019-03-25 13:08:33 +0100110}
111
Stefan Beller9e5252a2018-11-13 16:12:50 -0800112#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
113#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
Stefan Beller9e5252a2018-11-13 16:12:50 -0800114#define parse_commit(item) repo_parse_commit(the_repository, item)
115#endif
116
Jeff King7059dcc2013-10-24 04:52:36 -0400117void parse_commit_or_die(struct commit *item);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700118
Stefan Beller65ea9d42018-06-28 18:22:15 -0700119struct buffer_slab;
120struct buffer_slab *allocate_commit_buffer_slab(void);
121void free_commit_buffer_slab(struct buffer_slab *bs);
122
Jeff King0fb370d2014-06-12 18:05:37 -0400123/*
Jeff King66c28272014-06-10 17:40:14 -0400124 * Associate an object buffer with the commit. The ownership of the
125 * memory is handed over to the commit, and must be free()-able.
126 */
Stefan Beller1a40fc42018-06-28 18:22:16 -0700127void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
Jeff King66c28272014-06-10 17:40:14 -0400128
129/*
Jeff King152ff1c2014-06-10 17:40:39 -0400130 * Get any cached object buffer associated with the commit. Returns NULL
131 * if none. The resulting memory should not be freed.
132 */
Stefan Beller4ff7e5c2018-06-28 18:22:17 -0700133const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -0400134
135/*
136 * Get the commit's object contents, either from cache or by reading the object
137 * from disk. The resulting memory should not be modified, and must be given
138 * to unuse_commit_buffer when the caller is done.
139 */
Stefan Beller07de3fd2018-11-13 16:12:57 -0800140const void *repo_get_commit_buffer(struct repository *r,
141 const struct commit *,
142 unsigned long *size);
143#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
144#define get_commit_buffer(c, s) repo_get_commit_buffer(the_repository, c, s)
145#endif
Jeff King152ff1c2014-06-10 17:40:39 -0400146
147/*
Elijah Newren15beaaa2019-11-05 17:07:23 +0000148 * Tell the commit subsystem that we are done with a particular commit buffer.
Jeff King152ff1c2014-06-10 17:40:39 -0400149 * The commit and buffer should be the input and return value, respectively,
150 * from an earlier call to get_commit_buffer. The buffer may or may not be
151 * freed by this call; callers should not access the memory afterwards.
152 */
Stefan Beller70315372018-11-13 16:12:58 -0800153void repo_unuse_commit_buffer(struct repository *r,
154 const struct commit *,
155 const void *buffer);
156#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
157#define unuse_commit_buffer(c, b) repo_unuse_commit_buffer(the_repository, c, b)
158#endif
Jeff King152ff1c2014-06-10 17:40:39 -0400159
160/*
Jeff King0fb370d2014-06-12 18:05:37 -0400161 * Free any cached object buffer associated with the commit.
162 */
Stefan Beller6a7895f2018-12-14 16:09:40 -0800163void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
Jeff King0fb370d2014-06-12 18:05:37 -0400164
Nguyễn Thái Ngọc Duy301b8c72019-04-16 16:33:19 +0700165struct tree *repo_get_commit_tree(struct repository *, const struct commit *);
166#define get_commit_tree(c) repo_get_commit_tree(the_repository, c)
Derrick Stolee5bb03de2018-04-06 19:09:34 +0000167struct object_id *get_commit_tree_oid(const struct commit *);
168
Jeff King0fb370d2014-06-12 18:05:37 -0400169/*
Stefan Beller14ba97f2018-05-15 14:48:42 -0700170 * Release memory related to a commit, including the parent list and
171 * any cached object buffer.
172 */
Stefan Beller6a7895f2018-12-14 16:09:40 -0800173void release_commit_memory(struct parsed_object_pool *pool, struct commit *c);
Stefan Beller14ba97f2018-05-15 14:48:42 -0700174
175/*
Jeff King0fb370d2014-06-12 18:05:37 -0400176 * Disassociate any cached object buffer from the commit, but do not free it.
177 * The buffer (or NULL, if none) is returned.
178 */
Jeff King8597ea32014-06-10 17:44:13 -0400179const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
Jeff King0fb370d2014-06-12 18:05:37 -0400180
Christian Couder11af2aa2010-07-22 15:18:30 +0200181/* Find beginning and length of commit subject. */
182int find_commit_subject(const char *commit_buffer, const char **subject);
183
Charvi Mendiratta6e0e2882021-03-15 13:24:31 +0530184/* Return length of the commit subject from commit log message. */
185size_t commit_subject_length(const char *body);
186
Thiago Farina47e44ed2010-11-26 23:58:14 -0200187struct commit_list *commit_list_insert(struct commit *item,
188 struct commit_list **list);
Derrick Stolee597b2c32020-12-08 17:04:13 -0500189int commit_list_contains(struct commit *item,
190 struct commit_list *list);
René Scharfe89b5f1d2012-04-25 22:35:27 +0200191struct commit_list **commit_list_append(struct commit *commit,
192 struct commit_list **next);
Miklos Vajna65319472008-06-27 18:21:55 +0200193unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-26 23:58:14 -0200194struct commit_list *commit_list_insert_by_date(struct commit *item,
195 struct commit_list **list);
196void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700197
Thomas Rast53d00b32013-07-31 22:13:20 +0200198/* Shallow copy of the input list */
199struct commit_list *copy_commit_list(struct commit_list *list);
200
Elijah Newrenb0ca1202020-12-16 22:27:59 +0000201/* Modify list in-place to reverse it, returning new head; list will be tail */
202struct commit_list *reverse_commit_list(struct commit_list *list);
203
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700204void free_commit_list(struct commit_list *list);
205
René Scharfe6d167fd2017-03-01 12:37:07 +0100206struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
207
Denton Liu55454422019-04-29 04:28:14 -0400208int has_non_ascii(const char *text);
209const char *logmsg_reencode(const struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400210 char **commit_encoding,
211 const char *output_encoding);
Stefan Beller424510e2018-11-13 16:12:59 -0800212const char *repo_logmsg_reencode(struct repository *r,
213 const struct commit *commit,
214 char **commit_encoding,
215 const char *output_encoding);
216#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
217#define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out)
218#endif
219
Denton Liu55454422019-04-29 04:28:14 -0400220const char *skip_blank_lines(const char *msg);
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700221
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700222/** Removes the first commit from a list sorted by date, and adds all
223 * of its parents.
224 **/
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700225struct commit *pop_most_recent_commit(struct commit_list **list,
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700226 unsigned int mark);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700227
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +0000228struct commit *pop_commit(struct commit_list **stack);
229
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800230void clear_commit_marks(struct commit *commit, unsigned int mark);
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800231void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800232
Junio C Hamano08f704f2013-06-06 16:07:14 -0700233
234enum rev_sort_order {
235 REV_SORT_IN_GRAPH_ORDER = 0,
Junio C Hamano81c6b382013-06-07 10:35:54 -0700236 REV_SORT_BY_COMMIT_DATE,
237 REV_SORT_BY_AUTHOR_DATE
Junio C Hamano08f704f2013-06-06 16:07:14 -0700238};
239
Jon Seymourab580ac2005-07-07 02:39:34 +1000240/*
241 * Performs an in-place topological sort of list supplied.
242 *
Jon Seymourab580ac2005-07-07 02:39:34 +1000243 * invariant of resulting list is:
244 * a reachable from b => ord(b) < ord(a)
Junio C Hamano08f704f2013-06-06 16:07:14 -0700245 * sort_order further specifies:
246 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
247 * chain together.
248 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
Jon Seymourab580ac2005-07-07 02:39:34 +1000249 */
Junio C Hamano08f704f2013-06-06 16:07:14 -0700250void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
Junio C Hamano5040f172006-04-06 23:58:51 -0700251
252struct commit_graft {
brian m. carlson7683e2e2015-03-13 23:39:34 +0000253 struct object_id oid;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100254 int nr_parent; /* < 0 if shallow commit */
brian m. carlson7683e2e2015-03-13 23:39:34 +0000255 struct object_id parent[FLEX_ARRAY]; /* more */
Junio C Hamano5040f172006-04-06 23:58:51 -0700256};
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700257typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
Junio C Hamano5040f172006-04-06 23:58:51 -0700258
Patryk Obara9a934032017-08-18 20:33:12 +0200259struct commit_graft *read_graft_line(struct strbuf *line);
Taylor Blau183df642020-04-30 15:11:28 -0600260/* commit_graft_pos returns an index into r->parsed_objects->grafts. */
Jeff King98c431b2021-01-28 01:12:35 -0500261int commit_graft_pos(struct repository *r, const struct object_id *oid);
Brandon Williamsa3b78e82018-05-17 15:51:48 -0700262int register_commit_graft(struct repository *r, struct commit_graft *, int);
Derrick Stolee20fd6d52018-08-20 18:24:30 +0000263void prepare_commit_graft(struct repository *r);
Stefan Bellerb9dbddf2018-05-17 15:51:54 -0700264struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
Jonathan Tan2a69ff02022-03-17 11:24:47 -0700265void reset_commit_grafts(struct repository *r);
Junio C Hamano5040f172006-04-06 23:58:51 -0700266
Pratik Karki103148a2018-09-04 15:00:08 -0700267struct commit *get_fork_point(const char *refname, struct commit *commit);
268
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +0200269/* largest positive number a signed 32-bit integer can contain */
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +0700270#define INFINITE_DEPTH 0x7fffffff
271
brian m. carlson910650d2017-03-31 01:40:00 +0000272struct oid_array;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700273struct ref;
Denton Liu55454422019-04-29 04:28:14 -0400274int for_each_commit_graft(each_commit_graft_fn, void *);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100275
Jeff Kinge885a842020-09-30 08:28:18 -0400276int interactive_add(const char **argv, const char *prefix, int patch);
Denton Liu55454422019-04-29 04:28:14 -0400277int run_add_interactive(const char *revision, const char *patch_mode,
Denton Liuad6dad02019-04-29 04:28:23 -0400278 const struct pathspec *pathspec);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400279
Junio C Hamano5231c632011-11-07 16:21:32 -0800280struct commit_extra_header {
281 struct commit_extra_header *next;
282 char *key;
283 char *value;
284 size_t len;
285};
286
Denton Liu55454422019-04-29 04:28:14 -0400287void append_merge_tag_headers(struct commit_list *parents,
Denton Liuad6dad02019-04-29 04:28:23 -0400288 struct commit_extra_header ***tail);
Junio C Hamano5231c632011-11-07 16:21:32 -0800289
Denton Liu55454422019-04-29 04:28:14 -0400290int commit_tree(const char *msg, size_t msg_len,
Denton Liuad6dad02019-04-29 04:28:23 -0400291 const struct object_id *tree,
292 struct commit_list *parents, struct object_id *ret,
293 const char *author, const char *sign_commit);
Junio C Hamano5231c632011-11-07 16:21:32 -0800294
Denton Liu55454422019-04-29 04:28:14 -0400295int commit_tree_extended(const char *msg, size_t msg_len,
Denton Liuad6dad02019-04-29 04:28:23 -0400296 const struct object_id *tree,
Phillip Woode8cbe212020-08-17 18:40:01 +0100297 struct commit_list *parents, struct object_id *ret,
298 const char *author, const char *committer,
299 const char *sign_commit, struct commit_extra_header *);
Junio C Hamano5231c632011-11-07 16:21:32 -0800300
Denton Liu55454422019-04-29 04:28:14 -0400301struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -0800302
Denton Liu55454422019-04-29 04:28:14 -0400303void free_commit_extra_headers(struct commit_extra_header *extra);
Jeff King40d52ff2010-04-01 20:05:23 -0400304
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400305/*
306 * Search the commit object contents given by "msg" for the header "key".
John Caicfc5cf42022-01-06 20:07:35 +0000307 * Reads up to "len" bytes of "msg".
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400308 * Returns a pointer to the start of the header contents, or NULL. The length
309 * of the header, up to the first newline, is returned via out_len.
310 *
311 * Note that some headers (like mergetag) may be multi-line. It is the caller's
312 * responsibility to parse further in this case!
313 */
John Caicfc5cf42022-01-06 20:07:35 +0000314const char *find_header_mem(const char *msg, size_t len,
315 const char *key,
316 size_t *out_len);
317
Denton Liu55454422019-04-29 04:28:14 -0400318const char *find_commit_header(const char *msg, const char *key,
Denton Liuad6dad02019-04-29 04:28:23 -0400319 size_t *out_len);
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400320
Christian Couder8c384582014-11-09 10:23:41 +0100321/* Find the end of the log message, the right place for a new trailer. */
Denton Liu55454422019-04-29 04:28:14 -0400322size_t ignore_non_trailer(const char *buf, size_t len);
Christian Couder8c384582014-11-09 10:23:41 +0100323
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200324typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
Denton Liuad6dad02019-04-29 04:28:23 -0400325 void *cb_data);
Christian Couder063da622014-07-07 08:35:37 +0200326
Denton Liu55454422019-04-29 04:28:14 -0400327int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
Christian Couder063da622014-07-07 08:35:37 +0200328
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800329struct merge_remote_desc {
330 struct object *obj; /* the named object, could be a tag */
René Scharfe5447a762016-08-13 14:21:27 +0200331 char name[FLEX_ARRAY];
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800332};
Denton Liu55454422019-04-29 04:28:14 -0400333struct merge_remote_desc *merge_remote_util(struct commit *);
334void set_merge_remote_desc(struct commit *commit,
Denton Liuad6dad02019-04-29 04:28:23 -0400335 const char *name, struct object *obj);
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800336
337/*
338 * Given "name" from the command line to merge, find the commit object
339 * and return it, while storing merge_remote_desc in its ->util field,
340 * to allow callers to tell if we are told to merge a tag.
341 */
342struct commit *get_merge_parent(const char *name);
343
Denton Liu55454422019-04-29 04:28:14 -0400344int parse_signed_commit(const struct commit *commit,
brian m. carlson1fb5cf02021-01-18 23:49:11 +0000345 struct strbuf *message, struct strbuf *signature,
346 const struct git_hash_algo *algop);
Denton Liu55454422019-04-29 04:28:14 -0400347int remove_signature(struct strbuf *buf);
Christian Couder0b05ab62014-07-19 17:01:12 +0200348
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200349/*
Sebastian Götteeb307ae2013-03-31 18:02:46 +0200350 * Check the signature of the given commit. The result of the check is stored
351 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
352 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
353 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
354 * sig->signer and sig->key.
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200355 */
Denton Liu55454422019-04-29 04:28:14 -0400356int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200357
Derrick Stolee5284fc52018-11-01 13:46:21 +0000358/* record author-date for each commit object */
359struct author_date_slab;
360void record_author_date(struct author_date_slab *author_date,
361 struct commit *commit);
362
363int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);
Junio C Hamano6d2035e2018-11-18 18:23:54 +0900364
Jeff Kingedc4d472018-11-06 02:50:17 -0500365/*
366 * Verify a single commit with check_commit_signature() and die() if it is not
367 * a good signature. This isn't really suitable for general use, but is a
368 * helper to implement consistent logic for pull/merge --verify-signatures.
Hans Jerry Illikainen54887b42019-12-27 13:55:57 +0000369 *
370 * The check_trust parameter is meant for backward-compatibility. The GPG
371 * interface verifies key trust with a default trust level that is below the
372 * default trust level for merge operations. Its value should be non-zero if
373 * the user hasn't set a minimum trust level explicitly in their configuration.
374 *
375 * If the user has set a minimum trust level, then that value should be obeyed
376 * and check_trust should be zero, even if the configured trust level is below
377 * the default trust level for merges.
Jeff Kingedc4d472018-11-06 02:50:17 -0500378 */
Hans Jerry Illikainen54887b42019-12-27 13:55:57 +0000379void verify_merge_signature(struct commit *commit, int verbose,
380 int check_trust);
Jeff Kingedc4d472018-11-06 02:50:17 -0500381
Jeff King727377f2013-07-02 02:21:48 -0400382int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
Derrick Stolee3afc6792018-05-01 12:47:11 +0000383int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
Jeff King727377f2013-07-02 02:21:48 -0400384
Benoit Pierre15048f82014-03-18 11:00:53 +0100385LAST_ARG_MUST_BE_NULL
Ævar Arnfjörð Bjarmasona8cc5942022-03-07 13:33:46 +0100386int run_commit_hook(int editor_is_used, const char *index_file,
387 int *invoked_hook, const char *name, ...);
Benoit Pierre15048f82014-03-18 11:00:53 +0100388
brian m. carlson937032e2021-02-11 02:08:04 +0000389/* Sign a commit or tag buffer, storing the result in a header. */
390int sign_with_header(struct strbuf *buf, const char *keyid);
391/* Parse the signature out of a header. */
392int parse_buffer_signed_by_header(const char *buffer,
393 unsigned long size,
394 struct strbuf *payload,
395 struct strbuf *signature,
396 const struct git_hash_algo *algop);
397
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700398#endif /* COMMIT_H */