]> git.ipfire.org Git - thirdparty/git.git/blame - commit.h
merge/pull: verify GPG signatures of commits being merged
[thirdparty/git.git] / commit.h
CommitLineData
6eb8ae00
DB
1#ifndef COMMIT_H
2#define COMMIT_H
3
4#include "object.h"
5#include "tree.h"
674d1727 6#include "strbuf.h"
ca135e7a 7#include "decorate.h"
ffb6d7d5 8#include "gpg-interface.h"
6eb8ae00
DB
9
10struct commit_list {
11 struct commit *item;
12 struct commit_list *next;
13};
14
15struct commit {
16 struct object object;
d3ff6f55 17 void *util;
23c17d4a 18 unsigned int indegree;
6eb8ae00
DB
19 unsigned long date;
20 struct commit_list *parents;
21 struct tree *tree;
bd1e17e2 22 char *buffer;
6eb8ae00
DB
23};
24
60ab26de 25extern int save_commit_buffer;
6eb8ae00
DB
26extern const char *commit_type;
27
ca135e7a
LT
28/* While we can decorate any object with a name, it's only used for commits.. */
29extern struct decoration name_decoration;
30struct name_decoration {
31 struct name_decoration *next;
eb3005e2 32 int type;
ca135e7a
LT
33 char name[1];
34};
35
5d6ccf5c
JM
36struct commit *lookup_commit(const unsigned char *sha1);
37struct commit *lookup_commit_reference(const unsigned char *sha1);
f76412ed
JH
38struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
39 int quiet);
a6fa5992 40struct commit *lookup_commit_reference_by_name(const char *name);
6eb8ae00 41
baf18fc2
NTND
42/*
43 * Look up object named by "sha1", dereference tag as necessary,
44 * get a commit and return it. If "sha1" does not dereference to
45 * a commit, use ref_name to report an error and die.
46 */
47struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);
48
cf7b1cad 49int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
6eb8ae00
DB
50int parse_commit(struct commit *item);
51
11af2aae
CC
52/* Find beginning and length of commit subject. */
53int find_commit_subject(const char *commit_buffer, const char **subject);
54
47e44ed1
TF
55struct commit_list *commit_list_insert(struct commit *item,
56 struct commit_list **list);
89b5f1d9
RS
57struct commit_list **commit_list_append(struct commit *commit,
58 struct commit_list **next);
65319475 59unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
60struct commit_list *commit_list_insert_by_date(struct commit *item,
61 struct commit_list **list);
62void commit_list_sort_by_date(struct commit_list **list);
dd97f850 63
6eb8ae00
DB
64void free_commit_list(struct commit_list *list);
65
000182ea
LT
66/* Commit formats */
67enum cmit_fmt {
68 CMIT_FMT_RAW,
69 CMIT_FMT_MEDIUM,
70 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
9b66ec04
LT
71 CMIT_FMT_SHORT,
72 CMIT_FMT_FULL,
ff56fe1c 73 CMIT_FMT_FULLER,
d87449c5 74 CMIT_FMT_ONELINE,
3eefc189 75 CMIT_FMT_EMAIL,
e52a5de4 76 CMIT_FMT_USERFORMAT,
6b9c58f4 77
4b05548f 78 CMIT_FMT_UNSPECIFIED
000182ea
LT
79};
80
9cba13ca 81struct pretty_print_context {
6bf13944 82 enum cmit_fmt fmt;
dd2e794a
TR
83 int abbrev;
84 const char *subject;
85 const char *after_subject;
9553d2b2 86 int preserve_subject;
dd2e794a 87 enum date_mode date_mode;
f026c756 88 unsigned date_mode_explicit:1;
dd2e794a 89 int need_8bit_cte;
ddf333f6 90 char *notes_message;
8f8f5476 91 struct reflog_walk_info *reflog_info;
177b29dc 92 const char *output_encoding;
0e2913b0 93 struct string_list *mailmap;
30825178 94 int color;
dd2e794a
TR
95};
96
5b163603
JG
97struct userformat_want {
98 unsigned notes:1;
99};
100
28e9cf65 101extern int has_non_ascii(const char *text);
4da45bef 102struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
177b29dc
PN
103extern char *logmsg_reencode(const struct commit *commit,
104 const char *output_encoding);
dd0d388c 105extern void logmsg_free(char *msg, const struct commit *commit);
4da45bef 106extern void get_commit_format(const char *arg, struct rev_info *);
c8f1444d
RJ
107extern const char *format_subject(struct strbuf *sb, const char *msg,
108 const char *line_separator);
5b163603 109extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
674d1727 110extern void format_commit_message(const struct commit *commit,
7f98ebc8 111 const char *format, struct strbuf *sb,
dd2e794a 112 const struct pretty_print_context *context);
6bf13944
JK
113extern void pretty_print_commit(const struct pretty_print_context *pp,
114 const struct commit *commit,
115 struct strbuf *sb);
8b8a5374
JK
116extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
117 struct strbuf *sb);
6bf13944
JK
118void pp_user_info(const struct pretty_print_context *pp,
119 const char *what, struct strbuf *sb,
120 const char *line, const char *encoding);
121void pp_title_line(const struct pretty_print_context *pp,
b02bd65f
DB
122 const char **msg_p,
123 struct strbuf *sb,
b02bd65f 124 const char *encoding,
267123b4 125 int need_8bit_cte);
6bf13944 126void pp_remainder(const struct pretty_print_context *pp,
b02bd65f
DB
127 const char **msg_p,
128 struct strbuf *sb,
129 int indent);
130
e3bc7a3b 131
dd97f850
DB
132/** Removes the first commit from a list sorted by date, and adds all
133 * of its parents.
134 **/
a6080a0a 135struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 136 unsigned int mark);
dd97f850 137
a3437b8c
JS
138struct commit *pop_commit(struct commit_list **stack);
139
f8f9c73c 140void clear_commit_marks(struct commit *commit, unsigned int mark);
e895cb51 141void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
86a0a408 142void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
f8f9c73c 143
ab580ace
JS
144/*
145 * Performs an in-place topological sort of list supplied.
146 *
ab580ace
JS
147 * invariant of resulting list is:
148 * a reachable from b => ord(b) < ord(a)
4c8725f1
JH
149 * in addition, when lifo == 0, commits on parallel tracks are
150 * sorted in the dates order.
ab580ace 151 */
4c8725f1 152void sort_in_topological_order(struct commit_list ** list, int lifo);
5040f17e
JH
153
154struct commit_graft {
155 unsigned char sha1[20];
ed09aef0 156 int nr_parent; /* < 0 if shallow commit */
5040f17e
JH
157 unsigned char parent[FLEX_ARRAY][20]; /* more */
158};
09d46644 159typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
5040f17e
JH
160
161struct commit_graft *read_graft_line(char *buf, int len);
162int register_commit_graft(struct commit_graft *, int);
45163382 163struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
5040f17e 164
c0fa8255 165extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
53eda89b 166extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
5240c9d7 167extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
7c6f8aaf 168
4dcb167f
NTND
169/* largest postive number a signed 32-bit integer can contain */
170#define INFINITE_DEPTH 0x7fffffff
171
ed09aef0 172extern int register_shallow(const unsigned char *sha1);
f53514bc 173extern int unregister_shallow(const unsigned char *sha1);
09d46644 174extern int for_each_commit_graft(each_commit_graft_fn, void *);
f43117a6 175extern int is_repository_shallow(void);
ed09aef0 176extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514bc 177 int depth, int shallow_flag, int not_shallow_flag);
ed09aef0 178
7fcdb36e 179int is_descendant_of(struct commit *, struct commit_list *);
a20efee9 180int in_merge_bases(struct commit *, struct commit *);
4c4b27e8 181int in_merge_bases_many(struct commit *, int, struct commit **);
58680165 182
b4bd4668 183extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
46b5139c
TR
184extern int run_add_interactive(const char *revision, const char *patch_mode,
185 const char **pathspec);
58680165 186
53b2c823
LT
187static inline int single_parent(struct commit *commit)
188{
189 return commit->parents && !commit->parents->next;
190}
191
98cf9c3b
JH
192struct commit_list *reduce_heads(struct commit_list *heads);
193
5231c633
JH
194struct commit_extra_header {
195 struct commit_extra_header *next;
196 char *key;
197 char *value;
198 size_t len;
199};
200
201extern void append_merge_tag_headers(struct commit_list *parents,
202 struct commit_extra_header ***tail);
203
13f8b72d 204extern int commit_tree(const struct strbuf *msg, unsigned char *tree,
5231c633 205 struct commit_list *parents, unsigned char *ret,
ba3c69a9 206 const char *author, const char *sign_commit);
5231c633 207
f35ccd9b 208extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
5231c633 209 struct commit_list *parents, unsigned char *ret,
ba3c69a9 210 const char *author, const char *sign_commit,
5231c633
JH
211 struct commit_extra_header *);
212
c871a1d1 213extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
ed7a42a0 214
5231c633 215extern void free_commit_extra_headers(struct commit_extra_header *extra);
40d52ff7 216
ae8e4c9c
JH
217struct merge_remote_desc {
218 struct object *obj; /* the named object, could be a tag */
219 const char *name;
220};
221#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
222
223/*
224 * Given "name" from the command line to merge, find the commit object
225 * and return it, while storing merge_remote_desc in its ->util field,
226 * to allow callers to tell if we are told to merge a tag.
227 */
228struct commit *get_merge_parent(const char *name);
229
0c37f1fc
JH
230extern int parse_signed_commit(const unsigned char *sha1,
231 struct strbuf *message, struct strbuf *signature);
efc7df45
NTND
232extern void print_commit_list(struct commit_list *list,
233 const char *format_cur,
234 const char *format_last);
235
ffb6d7d5
SG
236/*
237 * Check the signature of the given commit. The result of the check is stored in
238 * sig->result, 'G' for a good signature, 'B' for a bad signature and 'N'
239 * for no signature at all.
240 * This may allocate memory for sig->gpg_output, sig->gpg_status, sig->signer
241 * and sig->key.
242 */
243extern void check_commit_signature(const struct commit* commit, struct signature_check *sigc);
244
6eb8ae00 245#endif /* COMMIT_H */