🌐 AI搜索 & 代理 主页
blob: 32e1a113e589f10ab3080dc173295083cd0c84ca [file] [log] [blame]
Daniel Barkalow6eb8ae02005-04-18 18:39:481#ifndef COMMIT_H
2#define COMMIT_H
3
4#include "object.h"
5#include "tree.h"
Pierre Habouzit674d1722007-09-10 10:35:066#include "strbuf.h"
Linus Torvaldsca135e72007-04-16 23:05:107#include "decorate.h"
Sebastian Götteffb6d7d2013-03-31 16:00:148#include "gpg-interface.h"
Jeff Kinga9080472013-07-03 07:08:229#include "string-list.h"
Daniel Barkalow6eb8ae02005-04-18 18:39:4810
11struct commit_list {
12 struct commit *item;
13 struct commit_list *next;
14};
15
16struct commit {
17 struct object object;
Linus Torvaldsd3ff6f52006-06-18 01:26:1818 void *util;
Jeff King96c4f4a2013-04-09 06:52:5619 unsigned int index;
Daniel Barkalow6eb8ae02005-04-18 18:39:4820 unsigned long date;
21 struct commit_list *parents;
22 struct tree *tree;
23};
24
Linus Torvalds60ab26d2005-09-15 21:43:1725extern int save_commit_buffer;
Daniel Barkalow6eb8ae02005-04-18 18:39:4826extern const char *commit_type;
27
Linus Torvaldsca135e72007-04-16 23:05:1028/* While we can decorate any object with a name, it's only used for commits.. */
Linus Torvaldsca135e72007-04-16 23:05:1029struct name_decoration {
30 struct name_decoration *next;
Nazri Ramliyeb3005e2010-06-19 01:37:3331 int type;
Jeff King2e3dfb22014-08-26 10:24:2032 char name[FLEX_ARRAY];
Linus Torvaldsca135e72007-04-16 23:05:1033};
34
Jeff King662174d2014-08-26 10:23:3635enum decoration_type {
36 DECORATION_NONE = 0,
37 DECORATION_REF_LOCAL,
38 DECORATION_REF_REMOTE,
39 DECORATION_REF_TAG,
40 DECORATION_REF_STASH,
41 DECORATION_REF_HEAD,
42 DECORATION_GRAFTED,
43};
44
45void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
Jeff King2608c242014-08-26 10:23:5446const struct name_decoration *get_name_decoration(const struct object *obj);
Jeff King662174d2014-08-26 10:23:3647
Jason McMullan5d6ccf52005-06-03 15:05:3948struct commit *lookup_commit(const unsigned char *sha1);
49struct commit *lookup_commit_reference(const unsigned char *sha1);
Junio C Hamanof76412e2005-08-21 09:51:1050struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
51 int quiet);
Pat Notza6fa5992010-11-02 19:59:0752struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 18:39:4853
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:4554/*
55 * Look up object named by "sha1", dereference tag as necessary,
56 * get a commit and return it. If "sha1" does not dereference to
57 * a commit, use ref_name to report an error and die.
58 */
59struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);
60
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 10:52:2061int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
Jeff King9cc2b072015-06-01 09:56:2662int parse_commit_gently(struct commit *item, int quiet_on_missing);
63static inline int parse_commit(struct commit *item)
64{
65 return parse_commit_gently(item, 0);
66}
Jeff King7059dcc2013-10-24 08:52:3667void parse_commit_or_die(struct commit *item);
Daniel Barkalow6eb8ae02005-04-18 18:39:4868
Jeff King0fb370d2014-06-12 22:05:3769/*
Jeff King66c28272014-06-10 21:40:1470 * Associate an object buffer with the commit. The ownership of the
71 * memory is handed over to the commit, and must be free()-able.
72 */
Jeff King8597ea32014-06-10 21:44:1373void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
Jeff King66c28272014-06-10 21:40:1474
75/*
Jeff King152ff1c2014-06-10 21:40:3976 * Get any cached object buffer associated with the commit. Returns NULL
77 * if none. The resulting memory should not be freed.
78 */
Jeff King8597ea32014-06-10 21:44:1379const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 21:40:3980
81/*
82 * Get the commit's object contents, either from cache or by reading the object
83 * from disk. The resulting memory should not be modified, and must be given
84 * to unuse_commit_buffer when the caller is done.
85 */
Jeff King8597ea32014-06-10 21:44:1386const void *get_commit_buffer(const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 21:40:3987
88/*
89 * Tell the commit subsytem that we are done with a particular commit buffer.
90 * The commit and buffer should be the input and return value, respectively,
91 * from an earlier call to get_commit_buffer. The buffer may or may not be
92 * freed by this call; callers should not access the memory afterwards.
93 */
94void unuse_commit_buffer(const struct commit *, const void *buffer);
95
96/*
Jeff King0fb370d2014-06-12 22:05:3797 * Free any cached object buffer associated with the commit.
98 */
99void free_commit_buffer(struct commit *);
100
101/*
102 * Disassociate any cached object buffer from the commit, but do not free it.
103 * The buffer (or NULL, if none) is returned.
104 */
Jeff King8597ea32014-06-10 21:44:13105const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
Jeff King0fb370d2014-06-12 22:05:37106
Christian Couder11af2aa2010-07-22 13:18:30107/* Find beginning and length of commit subject. */
108int find_commit_subject(const char *commit_buffer, const char **subject);
109
Thiago Farina47e44ed2010-11-27 01:58:14110struct commit_list *commit_list_insert(struct commit *item,
111 struct commit_list **list);
René Scharfe89b5f1d2012-04-25 20:35:27112struct commit_list **commit_list_append(struct commit *commit,
113 struct commit_list **next);
Miklos Vajna65319472008-06-27 16:21:55114unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-27 01:58:14115struct commit_list *commit_list_insert_by_date(struct commit *item,
116 struct commit_list **list);
117void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-24 01:47:23118
Thomas Rast53d00b32013-07-31 20:13:20119/* Shallow copy of the input list */
120struct commit_list *copy_commit_list(struct commit_list *list);
121
Daniel Barkalow6eb8ae02005-04-18 18:39:48122void free_commit_list(struct commit_list *list);
123
Linus Torvalds000182e2005-06-05 16:02:03124/* Commit formats */
125enum cmit_fmt {
126 CMIT_FMT_RAW,
127 CMIT_FMT_MEDIUM,
128 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
Linus Torvalds9b66ec02005-06-27 00:50:46129 CMIT_FMT_SHORT,
130 CMIT_FMT_FULL,
Junio C Hamanoff56fe12005-11-10 06:15:27131 CMIT_FMT_FULLER,
Junio C Hamanod87449c2005-08-09 05:15:40132 CMIT_FMT_ONELINE,
Junio C Hamano3eefc182006-04-18 23:45:27133 CMIT_FMT_EMAIL,
Eric Wong9f23e042016-06-05 04:46:39134 CMIT_FMT_MBOXRD,
Johannes Schindeline52a5de2007-02-23 00:35:03135 CMIT_FMT_USERFORMAT,
Junio C Hamano6b9c58f2006-04-16 06:46:36136
Gary V. Vaughan4b055482010-05-14 09:31:35137 CMIT_FMT_UNSPECIFIED
Linus Torvalds000182e2005-06-05 16:02:03138};
139
Eric Wong9f23e042016-06-05 04:46:39140static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
141{
142 return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
143}
144
Jonathan Nieder9cba13c2011-03-16 07:08:34145struct pretty_print_context {
Jeff King10f2fbf2013-07-03 07:07:48146 /*
147 * Callers should tweak these to change the behavior of pp_* functions.
148 */
Jeff King6bf13942011-05-26 22:27:49149 enum cmit_fmt fmt;
Thomas Rastdd2e7942009-10-19 15:48:08150 int abbrev;
151 const char *subject;
152 const char *after_subject;
Jeff King9553d2b2011-05-26 22:28:17153 int preserve_subject;
Jeff Kinga5481a62015-06-25 16:55:02154 struct date_mode date_mode;
Jeff Kingf026c752012-05-04 05:25:18155 unsigned date_mode_explicit:1;
Junio C Hamanofe37a9c2016-03-29 23:05:39156 int expand_tabs_in_log;
Thomas Rastdd2e7942009-10-19 15:48:08157 int need_8bit_cte;
Junio C Hamanoddf333f2012-10-18 01:51:47158 char *notes_message;
Thomas Rast8f8f5472009-10-19 15:48:10159 struct reflog_walk_info *reflog_info;
Pat Notz177b29d2010-11-02 19:59:08160 const char *output_encoding;
Antoine Pelisse0e2913b2013-01-05 21:26:41161 struct string_list *mailmap;
Junio C Hamano30825172012-12-17 22:56:49162 int color;
Jeff Kinga9080472013-07-03 07:08:22163 struct ident_split *from_ident;
Jeff King10f2fbf2013-07-03 07:07:48164
165 /*
166 * Fields below here are manipulated internally by pp_* functions and
167 * should not be counted on by callers.
168 */
Jeff Kinga9080472013-07-03 07:08:22169 struct string_list in_body_headers;
Josef Kufner3ad87c82016-06-16 13:18:37170 int graph_width;
Thomas Rastdd2e7942009-10-19 15:48:08171};
172
Johannes Gilger5b163602010-04-13 20:31:12173struct userformat_want {
174 unsigned notes:1;
175};
176
Johannes Schindelin28e9cf62009-08-10 16:22:18177extern int has_non_ascii(const char *text);
Junio C Hamano4da45be2008-04-08 00:11:34178struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
Jeff Kingb000c592014-06-10 21:39:30179extern const char *logmsg_reencode(const struct commit *commit,
180 char **commit_encoding,
181 const char *output_encoding);
Junio C Hamano4da45be2008-04-08 00:11:34182extern void get_commit_format(const char *arg, struct rev_info *);
Ramsay Jonesc8f14442011-04-07 18:26:23183extern const char *format_subject(struct strbuf *sb, const char *msg,
184 const char *line_separator);
Johannes Gilger5b163602010-04-13 20:31:12185extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
Jeff Kingb9c7d6e2014-07-29 17:56:48186extern int commit_format_is_empty(enum cmit_fmt);
Johannes Schindelin77356122016-06-22 20:20:16187extern const char *skip_blank_lines(const char *msg);
Pierre Habouzit674d1722007-09-10 10:35:06188extern void format_commit_message(const struct commit *commit,
Junio C Hamano7f98ebc2009-10-16 05:59:41189 const char *format, struct strbuf *sb,
Thomas Rastdd2e7942009-10-19 15:48:08190 const struct pretty_print_context *context);
Jeff King10f2fbf2013-07-03 07:07:48191extern void pretty_print_commit(struct pretty_print_context *pp,
Jeff King6bf13942011-05-26 22:27:49192 const struct commit *commit,
193 struct strbuf *sb);
Jeff King8b8a5372011-05-26 22:27:24194extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
195 struct strbuf *sb);
Jeff King10f2fbf2013-07-03 07:07:48196void pp_user_info(struct pretty_print_context *pp,
Jeff King6bf13942011-05-26 22:27:49197 const char *what, struct strbuf *sb,
198 const char *line, const char *encoding);
Jeff King10f2fbf2013-07-03 07:07:48199void pp_title_line(struct pretty_print_context *pp,
Daniel Barkalowb02bd652008-02-19 03:56:08200 const char **msg_p,
201 struct strbuf *sb,
Daniel Barkalowb02bd652008-02-19 03:56:08202 const char *encoding,
Junio C Hamano267123b2008-03-15 07:09:20203 int need_8bit_cte);
Jeff King10f2fbf2013-07-03 07:07:48204void pp_remainder(struct pretty_print_context *pp,
Daniel Barkalowb02bd652008-02-19 03:56:08205 const char **msg_p,
206 struct strbuf *sb,
207 int indent);
208
Linus Torvaldse3bc7a32005-06-01 15:34:23209
Daniel Barkalowdd97f852005-04-24 01:47:23210/** Removes the first commit from a list sorted by date, and adds all
211 * of its parents.
212 **/
Junio C Hamanoa6080a02007-06-07 07:04:01213struct commit *pop_most_recent_commit(struct commit_list **list,
Daniel Barkalow58e28af2005-04-24 03:29:22214 unsigned int mark);
Daniel Barkalowdd97f852005-04-24 01:47:23215
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40216struct commit *pop_commit(struct commit_list **stack);
217
Junio C Hamanof8f9c732006-01-08 02:52:42218void clear_commit_marks(struct commit *commit, unsigned int mark);
Junio C Hamanoe895cb52013-03-05 19:42:20219void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
René Scharfe86a0a402011-10-01 16:16:08220void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
Junio C Hamanof8f9c732006-01-08 02:52:42221
Junio C Hamano08f704f2013-06-06 23:07:14222
223enum rev_sort_order {
224 REV_SORT_IN_GRAPH_ORDER = 0,
Junio C Hamano81c6b382013-06-07 17:35:54225 REV_SORT_BY_COMMIT_DATE,
226 REV_SORT_BY_AUTHOR_DATE
Junio C Hamano08f704f2013-06-06 23:07:14227};
228
Jon Seymourab580ac2005-07-06 16:39:34229/*
230 * Performs an in-place topological sort of list supplied.
231 *
Jon Seymourab580ac2005-07-06 16:39:34232 * invariant of resulting list is:
233 * a reachable from b => ord(b) < ord(a)
Junio C Hamano08f704f2013-06-06 23:07:14234 * sort_order further specifies:
235 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
236 * chain together.
237 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
Jon Seymourab580ac2005-07-06 16:39:34238 */
Junio C Hamano08f704f2013-06-06 23:07:14239void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
Junio C Hamano5040f172006-04-07 06:58:51240
241struct commit_graft {
brian m. carlson7683e2e2015-03-13 23:39:34242 struct object_id oid;
Johannes Schindelined09aef2006-10-30 19:09:06243 int nr_parent; /* < 0 if shallow commit */
brian m. carlson7683e2e2015-03-13 23:39:34244 struct object_id parent[FLEX_ARRAY]; /* more */
Junio C Hamano5040f172006-04-07 06:58:51245};
Nguyễn Thái Ngọc Duy09d46642011-08-18 12:29:35246typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
Junio C Hamano5040f172006-04-07 06:58:51247
248struct commit_graft *read_graft_line(char *buf, int len);
249int register_commit_graft(struct commit_graft *, int);
Martin Koegler45163382008-02-25 21:46:07250struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
Junio C Hamano5040f172006-04-07 06:58:51251
Junio C Hamano2ce406c2014-10-30 19:20:44252extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
253extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
Miklos Vajna5240c9d2008-06-27 16:22:00254extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
Johannes Schindelin7c6f8aa2006-06-29 13:17:32255
Junio C Hamano2ce406c2014-10-30 19:20:44256/* To be used only when object flags after this call no longer matter */
257extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
258
Stefano Lattarini41ccfdd2013-04-11 22:36:10259/* largest positive number a signed 32-bit integer can contain */
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 09:05:46260#define INFINITE_DEPTH 0x7fffffff
261
Nguyễn Thái Ngọc Duy58babff2013-12-05 13:02:35262struct sha1_array;
263struct ref;
Johannes Schindelined09aef2006-10-30 19:09:06264extern int register_shallow(const unsigned char *sha1);
Johannes Schindelinf53514b2006-10-30 19:09:53265extern int unregister_shallow(const unsigned char *sha1);
Nguyễn Thái Ngọc Duy09d46642011-08-18 12:29:35266extern int for_each_commit_graft(each_commit_graft_fn, void *);
Junio C Hamanof43117a2007-01-22 06:22:23267extern int is_repository_shallow(void);
Johannes Schindelined09aef2006-10-30 19:09:06268extern struct commit_list *get_shallow_commits(struct object_array *heads,
Johannes Schindelinf53514b2006-10-30 19:09:53269 int depth, int shallow_flag, int not_shallow_flag);
Nguyễn Thái Ngọc Duy069c0532013-12-05 13:02:45270extern void set_alternate_shallow_file(const char *path, int override);
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 13:02:34271extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
272 const struct sha1_array *extra);
Nguyễn Thái Ngọc Duy3125fe52013-08-16 09:52:02273extern void setup_alternate_shallow(struct lock_file *shallow_lock,
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 13:02:34274 const char **alternate_shallow_file,
275 const struct sha1_array *extra);
Jeff King0179c942014-02-27 11:25:20276extern const char *setup_temporary_shallow(const struct sha1_array *extra);
Nguyễn Thái Ngọc Duyad491362013-12-05 13:02:32277extern void advertise_shallow_grafts(int);
Johannes Schindelined09aef2006-10-30 19:09:06278
Nguyễn Thái Ngọc Duy58babff2013-12-05 13:02:35279struct shallow_info {
280 struct sha1_array *shallow;
281 int *ours, nr_ours;
282 int *theirs, nr_theirs;
283 struct sha1_array *ref;
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 13:02:47284
285 /* for receive-pack */
286 uint32_t **used_shallow;
287 int *need_reachability_test;
288 int *reachable;
289 int *shallow_ref;
290 struct commit **commits;
291 int nr_commits;
Nguyễn Thái Ngọc Duy58babff2013-12-05 13:02:35292};
293
294extern void prepare_shallow_info(struct shallow_info *, struct sha1_array *);
295extern void clear_shallow_info(struct shallow_info *);
296extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
Nguyễn Thái Ngọc Duy8e277382013-12-05 13:02:36297extern void assign_shallow_commits_to_refs(struct shallow_info *info,
298 uint32_t **used,
299 int *ref_status);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 13:02:47300extern int delayed_reachability_test(struct shallow_info *si, int c);
Nguyễn Thái Ngọc Duyeab32962013-12-05 13:02:54301extern void prune_shallow(int show_only);
Karsten Blees6aa30852014-07-12 00:00:06302extern struct trace_key trace_shallow;
Daniel Barkalow6eb8ae02005-04-18 18:39:48303
Jake Goulding7fcdb362009-01-26 14:13:24304int is_descendant_of(struct commit *, struct commit_list *);
Junio C Hamanoa20efee2012-08-27 21:46:01305int in_merge_bases(struct commit *, struct commit *);
Junio C Hamano4c4b27e2013-03-04 18:16:42306int in_merge_bases_many(struct commit *, int, struct commit **);
Kristian Høgsberg58680162007-09-18 00:06:44307
Conrad Irwinb4bd4662011-05-07 17:58:07308extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
Thomas Rast46b51392009-08-13 12:29:41309extern int run_add_interactive(const char *revision, const char *patch_mode,
Nguyễn Thái Ngọc Duy480ca642013-07-14 08:35:50310 const struct pathspec *pathspec);
Kristian Høgsberg58680162007-09-18 00:06:44311
Linus Torvalds53b2c822007-11-05 21:22:34312static inline int single_parent(struct commit *commit)
313{
314 return commit->parents && !commit->parents->next;
315}
316
Junio C Hamano98cf9c32008-06-27 16:22:03317struct commit_list *reduce_heads(struct commit_list *heads);
318
Junio C Hamano5231c632011-11-08 00:21:32319struct commit_extra_header {
320 struct commit_extra_header *next;
321 char *key;
322 char *value;
323 size_t len;
324};
325
326extern void append_merge_tag_headers(struct commit_list *parents,
327 struct commit_extra_header ***tail);
328
Jeff King3ffefb52014-06-10 21:36:52329extern int commit_tree(const char *msg, size_t msg_len,
330 const unsigned char *tree,
Junio C Hamano5231c632011-11-08 00:21:32331 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-06 00:23:20332 const char *author, const char *sign_commit);
Junio C Hamano5231c632011-11-08 00:21:32333
Jeff King3ffefb52014-06-10 21:36:52334extern int commit_tree_extended(const char *msg, size_t msg_len,
335 const unsigned char *tree,
Junio C Hamano5231c632011-11-08 00:21:32336 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-06 00:23:20337 const char *author, const char *sign_commit,
Junio C Hamano5231c632011-11-08 00:21:32338 struct commit_extra_header *);
339
Junio C Hamanoc871a1d2012-01-05 18:54:14340extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
Junio C Hamanoed7a42a2011-11-08 23:38:07341
Junio C Hamano5231c632011-11-08 00:21:32342extern void free_commit_extra_headers(struct commit_extra_header *extra);
Jeff King40d52ff2010-04-02 00:05:23343
Jeff Kingfe6eb7f2014-08-27 07:56:01344/*
345 * Search the commit object contents given by "msg" for the header "key".
346 * Returns a pointer to the start of the header contents, or NULL. The length
347 * of the header, up to the first newline, is returned via out_len.
348 *
349 * Note that some headers (like mergetag) may be multi-line. It is the caller's
350 * responsibility to parse further in this case!
351 */
352extern const char *find_commit_header(const char *msg, const char *key,
353 size_t *out_len);
354
Christian Couder8c384582014-11-09 09:23:41355/* Find the end of the log message, the right place for a new trailer. */
356extern int ignore_non_trailer(struct strbuf *sb);
357
Christian Couder063da622014-07-07 06:35:37358typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
359 void *cb_data);
360
361extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
362
Junio C Hamanoae8e4c92011-11-07 21:26:22363struct merge_remote_desc {
364 struct object *obj; /* the named object, could be a tag */
René Scharfe5447a762016-08-13 12:21:27365 char name[FLEX_ARRAY];
Junio C Hamanoae8e4c92011-11-07 21:26:22366};
367#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
René Scharfebeb518c2016-08-13 12:11:27368extern void set_merge_remote_desc(struct commit *commit,
369 const char *name, struct object *obj);
Junio C Hamanoae8e4c92011-11-07 21:26:22370
371/*
372 * Given "name" from the command line to merge, find the commit object
373 * and return it, while storing merge_remote_desc in its ->util field,
374 * to allow callers to tell if we are told to merge a tag.
375 */
376struct commit *get_merge_parent(const char *name);
377
Jeff King218aa3a2014-06-13 06:32:11378extern int parse_signed_commit(const struct commit *commit,
Junio C Hamano0c37f1f2011-10-18 22:53:23379 struct strbuf *message, struct strbuf *signature);
Christian Couder0b05ab62014-07-19 15:01:12380extern int remove_signature(struct strbuf *buf);
381
Sebastian Götteffb6d7d2013-03-31 16:00:14382/*
Sebastian Götteeb307ae2013-03-31 16:02:46383 * Check the signature of the given commit. The result of the check is stored
384 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
385 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
386 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
387 * sig->signer and sig->key.
Sebastian Götteffb6d7d2013-03-31 16:00:14388 */
brian m. carlson434060e2015-06-21 23:14:40389extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
Sebastian Götteffb6d7d2013-03-31 16:00:14390
Jeff King727377f2013-07-02 06:21:48391int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
392
Benoit Pierre15048f82014-03-18 10:00:53393LAST_ARG_MUST_BE_NULL
394extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
395
Daniel Barkalow6eb8ae02005-04-18 18:39:48396#endif /* COMMIT_H */