blob: da0db36eba2bf16277dbb7aadcb3384e29191ecc [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"
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070011
Derrick Stolee177722b2018-04-10 08:56:05 -040012#define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
Derrick Stolee83073cc2018-04-25 14:37:55 +000013#define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
14#define GENERATION_NUMBER_MAX 0x3FFFFFFF
15#define GENERATION_NUMBER_ZERO 0
Derrick Stolee177722b2018-04-10 08:56:05 -040016
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070017struct commit_list {
18 struct commit *item;
19 struct commit_list *next;
20};
21
Nguyễn Thái Ngọc Duy9d2c9702018-05-19 07:28:31 +020022/*
23 * The size of this struct matters in full repo walk operations like
24 * 'git clone' or 'git gc'. Consider using commit-slab to attach data
25 * to a commit instead of adding new fields here.
26 */
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070027struct commit {
28 struct object object;
Johannes Schindelindddbad72017-04-26 21:29:31 +020029 timestamp_t date;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070030 struct commit_list *parents;
Derrick Stolee7b8a21d2018-04-06 19:09:46 +000031
32 /*
33 * If the commit is loaded from the commit-graph file, then this
34 * member may be NULL. Only access it through get_commit_tree()
35 * or get_commit_tree_oid().
36 */
Derrick Stolee891435d2018-04-06 19:09:32 +000037 struct tree *maybe_tree;
Derrick Stolee177722b2018-04-10 08:56:05 -040038 uint32_t graph_pos;
Derrick Stolee83073cc2018-04-25 14:37:55 +000039 uint32_t generation;
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;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070044extern const char *commit_type;
45
Linus Torvaldsca135e72007-04-16 16:05:10 -070046/* While we can decorate any object with a name, it's only used for commits.. */
Linus Torvaldsca135e72007-04-16 16:05:10 -070047struct name_decoration {
48 struct name_decoration *next;
Nazri Ramliyeb3005e2010-06-19 09:37:33 +080049 int type;
Jeff King2e3dfb22014-08-26 06:24:20 -040050 char name[FLEX_ARRAY];
Linus Torvaldsca135e72007-04-16 16:05:10 -070051};
52
Jeff King662174d2014-08-26 06:23:36 -040053enum decoration_type {
54 DECORATION_NONE = 0,
55 DECORATION_REF_LOCAL,
56 DECORATION_REF_REMOTE,
57 DECORATION_REF_TAG,
58 DECORATION_REF_STASH,
59 DECORATION_REF_HEAD,
60 DECORATION_GRAFTED,
61};
62
63void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
Jeff King2608c242014-08-26 06:23:54 -040064const struct name_decoration *get_name_decoration(const struct object *obj);
Jeff King662174d2014-08-26 06:23:36 -040065
Stefan Bellerbacf1682018-06-28 18:22:10 -070066struct commit *lookup_commit(struct repository *r, const struct object_id *oid);
Stefan Beller1f6c72f2018-06-28 18:22:22 -070067struct commit *lookup_commit_reference(struct repository *r,
68 const struct object_id *oid);
Stefan Bellerd9a05e72018-06-28 18:22:21 -070069struct commit *lookup_commit_reference_gently(struct repository *r,
Stefan Beller21e1ee82018-06-28 18:21:57 -070070 const struct object_id *oid,
Junio C Hamanof76412e2005-08-21 02:51:10 -070071 int quiet);
Pat Notza6fa5992010-11-02 13:59:07 -060072struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070073
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100074/*
brian m. carlsonbc832662017-05-06 22:10:10 +000075 * Look up object named by "oid", dereference tag as necessary,
76 * get a commit and return it. If "oid" does not dereference to
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100077 * a commit, use ref_name to report an error and die.
78 */
brian m. carlsonbc832662017-05-06 22:10:10 +000079struct 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 +100080
Stefan Bellerfd8030c2018-06-28 18:22:13 -070081int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph);
Derrick Stolee9b19ada2018-06-27 09:24:30 -040082int parse_commit_internal(struct commit *item, int quiet_on_missing, int use_commit_graph);
Jeff King9cc2b072015-06-01 05:56:26 -040083int parse_commit_gently(struct commit *item, int quiet_on_missing);
84static inline int parse_commit(struct commit *item)
85{
86 return parse_commit_gently(item, 0);
87}
Jeff King7059dcc2013-10-24 04:52:36 -040088void parse_commit_or_die(struct commit *item);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070089
Stefan Beller65ea9d42018-06-28 18:22:15 -070090struct buffer_slab;
91struct buffer_slab *allocate_commit_buffer_slab(void);
92void free_commit_buffer_slab(struct buffer_slab *bs);
93
Jeff King0fb370d2014-06-12 18:05:37 -040094/*
Jeff King66c28272014-06-10 17:40:14 -040095 * Associate an object buffer with the commit. The ownership of the
96 * memory is handed over to the commit, and must be free()-able.
97 */
Stefan Beller1a40fc42018-06-28 18:22:16 -070098void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
Jeff King66c28272014-06-10 17:40:14 -040099
100/*
Jeff King152ff1c2014-06-10 17:40:39 -0400101 * Get any cached object buffer associated with the commit. Returns NULL
102 * if none. The resulting memory should not be freed.
103 */
Stefan Beller4ff7e5c2018-06-28 18:22:17 -0700104const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -0400105
106/*
107 * Get the commit's object contents, either from cache or by reading the object
108 * from disk. The resulting memory should not be modified, and must be given
109 * to unuse_commit_buffer when the caller is done.
110 */
Jeff King8597ea32014-06-10 17:44:13 -0400111const void *get_commit_buffer(const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -0400112
113/*
114 * Tell the commit subsytem that we are done with a particular commit buffer.
115 * The commit and buffer should be the input and return value, respectively,
116 * from an earlier call to get_commit_buffer. The buffer may or may not be
117 * freed by this call; callers should not access the memory afterwards.
118 */
119void unuse_commit_buffer(const struct commit *, const void *buffer);
120
121/*
Jeff King0fb370d2014-06-12 18:05:37 -0400122 * Free any cached object buffer associated with the commit.
123 */
124void free_commit_buffer(struct commit *);
125
Derrick Stolee5bb03de2018-04-06 19:09:34 +0000126struct tree *get_commit_tree(const struct commit *);
127struct object_id *get_commit_tree_oid(const struct commit *);
128
Jeff King0fb370d2014-06-12 18:05:37 -0400129/*
Stefan Beller14ba97f2018-05-15 14:48:42 -0700130 * Release memory related to a commit, including the parent list and
131 * any cached object buffer.
132 */
133void release_commit_memory(struct commit *c);
134
135/*
Jeff King0fb370d2014-06-12 18:05:37 -0400136 * Disassociate any cached object buffer from the commit, but do not free it.
137 * The buffer (or NULL, if none) is returned.
138 */
Jeff King8597ea32014-06-10 17:44:13 -0400139const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
Jeff King0fb370d2014-06-12 18:05:37 -0400140
Christian Couder11af2aa2010-07-22 15:18:30 +0200141/* Find beginning and length of commit subject. */
142int find_commit_subject(const char *commit_buffer, const char **subject);
143
Thiago Farina47e44ed2010-11-26 23:58:14 -0200144struct commit_list *commit_list_insert(struct commit *item,
145 struct commit_list **list);
René Scharfe89b5f1d2012-04-25 22:35:27 +0200146struct commit_list **commit_list_append(struct commit *commit,
147 struct commit_list **next);
Miklos Vajna65319472008-06-27 18:21:55 +0200148unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-26 23:58:14 -0200149struct commit_list *commit_list_insert_by_date(struct commit *item,
150 struct commit_list **list);
151void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700152
Thomas Rast53d00b32013-07-31 22:13:20 +0200153/* Shallow copy of the input list */
154struct commit_list *copy_commit_list(struct commit_list *list);
155
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700156void free_commit_list(struct commit_list *list);
157
René Scharfe6d167fd2017-03-01 12:37:07 +0100158struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
159
Johannes Schindelin28e9cf62009-08-10 18:22:18 +0200160extern int has_non_ascii(const char *text);
Jeff Kingb000c592014-06-10 17:39:30 -0400161extern const char *logmsg_reencode(const struct commit *commit,
162 char **commit_encoding,
163 const char *output_encoding);
Johannes Schindelin77356122016-06-22 22:20:16 +0200164extern const char *skip_blank_lines(const char *msg);
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700165
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700166/** Removes the first commit from a list sorted by date, and adds all
167 * of its parents.
168 **/
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700169struct commit *pop_most_recent_commit(struct commit_list **list,
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700170 unsigned int mark);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700171
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +0000172struct commit *pop_commit(struct commit_list **stack);
173
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800174void clear_commit_marks(struct commit *commit, unsigned int mark);
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800175void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800176
Junio C Hamano08f704f2013-06-06 16:07:14 -0700177
178enum rev_sort_order {
179 REV_SORT_IN_GRAPH_ORDER = 0,
Junio C Hamano81c6b382013-06-07 10:35:54 -0700180 REV_SORT_BY_COMMIT_DATE,
181 REV_SORT_BY_AUTHOR_DATE
Junio C Hamano08f704f2013-06-06 16:07:14 -0700182};
183
Jon Seymourab580ac2005-07-07 02:39:34 +1000184/*
185 * Performs an in-place topological sort of list supplied.
186 *
Jon Seymourab580ac2005-07-07 02:39:34 +1000187 * invariant of resulting list is:
188 * a reachable from b => ord(b) < ord(a)
Junio C Hamano08f704f2013-06-06 16:07:14 -0700189 * sort_order further specifies:
190 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
191 * chain together.
192 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
Jon Seymourab580ac2005-07-07 02:39:34 +1000193 */
Junio C Hamano08f704f2013-06-06 16:07:14 -0700194void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
Junio C Hamano5040f172006-04-06 23:58:51 -0700195
196struct commit_graft {
brian m. carlson7683e2e2015-03-13 23:39:34 +0000197 struct object_id oid;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100198 int nr_parent; /* < 0 if shallow commit */
brian m. carlson7683e2e2015-03-13 23:39:34 +0000199 struct object_id parent[FLEX_ARRAY]; /* more */
Junio C Hamano5040f172006-04-06 23:58:51 -0700200};
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700201typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
Junio C Hamano5040f172006-04-06 23:58:51 -0700202
Patryk Obara9a934032017-08-18 20:33:12 +0200203struct commit_graft *read_graft_line(struct strbuf *line);
Brandon Williamsa3b78e82018-05-17 15:51:48 -0700204int register_commit_graft(struct repository *r, struct commit_graft *, int);
Stefan Bellerb9dbddf2018-05-17 15:51:54 -0700205struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
Junio C Hamano5040f172006-04-06 23:58:51 -0700206
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700207extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
208extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200209extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200210
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700211/* To be used only when object flags after this call no longer matter */
212extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
213
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +0200214/* largest positive number a signed 32-bit integer can contain */
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +0700215#define INFINITE_DEPTH 0x7fffffff
216
brian m. carlson910650d2017-03-31 01:40:00 +0000217struct oid_array;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700218struct ref;
Stefan Bellereee45022018-05-17 15:51:52 -0700219extern int register_shallow(struct repository *r, const struct object_id *oid);
brian m. carlsone92b8482017-05-06 22:10:06 +0000220extern int unregister_shallow(const struct object_id *oid);
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700221extern int for_each_commit_graft(each_commit_graft_fn, void *);
Stefan Bellereee45022018-05-17 15:51:52 -0700222extern int is_repository_shallow(struct repository *r);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100223extern struct commit_list *get_shallow_commits(struct object_array *heads,
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100224 int depth, int shallow_flag, int not_shallow_flag);
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700225extern struct commit_list *get_shallow_commits_by_rev_list(
226 int ac, const char **av, int shallow_flag, int not_shallow_flag);
Stefan Bellereee45022018-05-17 15:51:52 -0700227extern void set_alternate_shallow_file(struct repository *r, const char *path, int override);
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700228extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
brian m. carlson910650d2017-03-31 01:40:00 +0000229 const struct oid_array *extra);
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700230extern void setup_alternate_shallow(struct lock_file *shallow_lock,
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700231 const char **alternate_shallow_file,
brian m. carlson910650d2017-03-31 01:40:00 +0000232 const struct oid_array *extra);
233extern const char *setup_temporary_shallow(const struct oid_array *extra);
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700234extern void advertise_shallow_grafts(int);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100235
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700236struct shallow_info {
brian m. carlson910650d2017-03-31 01:40:00 +0000237 struct oid_array *shallow;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700238 int *ours, nr_ours;
239 int *theirs, nr_theirs;
brian m. carlson910650d2017-03-31 01:40:00 +0000240 struct oid_array *ref;
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700241
242 /* for receive-pack */
243 uint32_t **used_shallow;
244 int *need_reachability_test;
245 int *reachable;
246 int *shallow_ref;
247 struct commit **commits;
248 int nr_commits;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700249};
250
brian m. carlson910650d2017-03-31 01:40:00 +0000251extern void prepare_shallow_info(struct shallow_info *, struct oid_array *);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700252extern void clear_shallow_info(struct shallow_info *);
253extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700254extern void assign_shallow_commits_to_refs(struct shallow_info *info,
255 uint32_t **used,
256 int *ref_status);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700257extern int delayed_reachability_test(struct shallow_info *si, int c);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700258extern void prune_shallow(int show_only);
Karsten Blees6aa30852014-07-12 02:00:06 +0200259extern struct trace_key trace_shallow;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700260
Jake Goulding7fcdb362009-01-26 09:13:24 -0500261int is_descendant_of(struct commit *, struct commit_list *);
Junio C Hamanoa20efee2012-08-27 14:46:01 -0700262int in_merge_bases(struct commit *, struct commit *);
Junio C Hamano4c4b27e2013-03-04 10:16:42 -0800263int in_merge_bases_many(struct commit *, int, struct commit **);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400264
Conrad Irwinb4bd4662011-05-07 10:58:07 -0700265extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
Thomas Rast46b51392009-08-13 14:29:41 +0200266extern int run_add_interactive(const char *revision, const char *patch_mode,
Nguyễn Thái Ngọc Duy480ca642013-07-14 15:35:50 +0700267 const struct pathspec *pathspec);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400268
Martin Ågren4da72642017-11-07 21:39:45 +0100269/*
270 * Takes a list of commits and returns a new list where those
271 * have been removed that can be reached from other commits in
272 * the list. It is useful for, e.g., reducing the commits
273 * randomly thrown at the git-merge command and removing
274 * redundant commits that the user shouldn't have given to it.
275 *
276 * This function destroys the STALE bit of the commit objects'
277 * flags.
278 */
279extern struct commit_list *reduce_heads(struct commit_list *heads);
280
281/*
282 * Like `reduce_heads()`, except it replaces the list. Use this
283 * instead of `foo = reduce_heads(foo);` to avoid memory leaks.
284 */
285extern void reduce_heads_replace(struct commit_list **heads);
Junio C Hamano98cf9c32008-06-27 18:22:03 +0200286
Junio C Hamano5231c632011-11-07 16:21:32 -0800287struct commit_extra_header {
288 struct commit_extra_header *next;
289 char *key;
290 char *value;
291 size_t len;
292};
293
294extern void append_merge_tag_headers(struct commit_list *parents,
295 struct commit_extra_header ***tail);
296
Jeff King3ffefb52014-06-10 17:36:52 -0400297extern int commit_tree(const char *msg, size_t msg_len,
Patryk Obara5078f342018-01-28 01:13:16 +0100298 const struct object_id *tree,
299 struct commit_list *parents, struct object_id *ret,
Junio C Hamanoba3c69a2011-10-05 17:23:20 -0700300 const char *author, const char *sign_commit);
Junio C Hamano5231c632011-11-07 16:21:32 -0800301
Jeff King3ffefb52014-06-10 17:36:52 -0400302extern int commit_tree_extended(const char *msg, size_t msg_len,
Patryk Obara5078f342018-01-28 01:13:16 +0100303 const struct object_id *tree,
304 struct commit_list *parents,
305 struct object_id *ret, const char *author,
306 const char *sign_commit,
Junio C Hamano5231c632011-11-07 16:21:32 -0800307 struct commit_extra_header *);
308
Junio C Hamanoc871a1d2012-01-05 10:54:14 -0800309extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -0800310
Junio C Hamano5231c632011-11-07 16:21:32 -0800311extern void free_commit_extra_headers(struct commit_extra_header *extra);
Jeff King40d52ff2010-04-01 20:05:23 -0400312
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400313/*
314 * Search the commit object contents given by "msg" for the header "key".
315 * Returns a pointer to the start of the header contents, or NULL. The length
316 * of the header, up to the first newline, is returned via out_len.
317 *
318 * Note that some headers (like mergetag) may be multi-line. It is the caller's
319 * responsibility to parse further in this case!
320 */
321extern const char *find_commit_header(const char *msg, const char *key,
322 size_t *out_len);
323
Christian Couder8c384582014-11-09 10:23:41 +0100324/* Find the end of the log message, the right place for a new trailer. */
Jonathan Tan710714a2016-11-02 10:29:17 -0700325extern int ignore_non_trailer(const char *buf, size_t len);
Christian Couder8c384582014-11-09 10:23:41 +0100326
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200327typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
Christian Couder063da622014-07-07 08:35:37 +0200328 void *cb_data);
329
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200330extern int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
Christian Couder063da622014-07-07 08:35:37 +0200331
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800332struct merge_remote_desc {
333 struct object *obj; /* the named object, could be a tag */
René Scharfe5447a762016-08-13 14:21:27 +0200334 char name[FLEX_ARRAY];
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800335};
Nguyễn Thái Ngọc Duye2e5ac22018-05-19 07:28:30 +0200336extern struct merge_remote_desc *merge_remote_util(struct commit *);
René Scharfebeb518c2016-08-13 14:11:27 +0200337extern void set_merge_remote_desc(struct commit *commit,
338 const char *name, struct object *obj);
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800339
340/*
341 * Given "name" from the command line to merge, find the commit object
342 * and return it, while storing merge_remote_desc in its ->util field,
343 * to allow callers to tell if we are told to merge a tag.
344 */
345struct commit *get_merge_parent(const char *name);
346
Jeff King218aa3a2014-06-13 02:32:11 -0400347extern int parse_signed_commit(const struct commit *commit,
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700348 struct strbuf *message, struct strbuf *signature);
Christian Couder0b05ab62014-07-19 17:01:12 +0200349extern int remove_signature(struct strbuf *buf);
350
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200351/*
Sebastian Götteeb307ae2013-03-31 18:02:46 +0200352 * Check the signature of the given commit. The result of the check is stored
353 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
354 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
355 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
356 * sig->signer and sig->key.
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200357 */
brian m. carlson434060e2015-06-21 23:14:40 +0000358extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200359
Jeff King727377f2013-07-02 02:21:48 -0400360int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
Derrick Stolee3afc6792018-05-01 12:47:11 +0000361int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
Jeff King727377f2013-07-02 02:21:48 -0400362
Benoit Pierre15048f82014-03-18 11:00:53 +0100363LAST_ARG_MUST_BE_NULL
364extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
365
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700366#endif /* COMMIT_H */