]> git.ipfire.org Git - thirdparty/git.git/blame - commit.h
Merge branch 'ab/config-multi-and-nonbool'
[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"
a9080475 9#include "string-list.h"
cf394719 10#include "pretty.h"
5284fc5c 11#include "commit-slab.h"
6eb8ae00 12
177722b3 13#define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
d7f92784
AK
14#define GENERATION_NUMBER_INFINITY ((1ULL << 63) - 1)
15#define GENERATION_NUMBER_V1_MAX 0x3FFFFFFF
83073cc9 16#define GENERATION_NUMBER_ZERO 0
e8b63005 17#define GENERATION_NUMBER_V2_OFFSET_MAX ((1ULL << 31) - 1)
177722b3 18
6eb8ae00
DB
19struct commit_list {
20 struct commit *item;
21 struct commit_list *next;
22};
23
9d2c9701
NTND
24/*
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 */
6eb8ae00
DB
29struct commit {
30 struct object object;
dddbad72 31 timestamp_t date;
6eb8ae00 32 struct commit_list *parents;
7b8a21db
DS
33
34 /*
35 * If the commit is loaded from the commit-graph file, then this
301b8c7f 36 * member may be NULL. Only access it through repo_get_commit_tree()
7b8a21db
DS
37 * or get_commit_tree_oid().
38 */
891435d5 39 struct tree *maybe_tree;
25f859fd 40 unsigned int index;
6eb8ae00
DB
41};
42
60ab26de 43extern int save_commit_buffer;
ab628588 44extern int no_graft_file_deprecated_advice;
6eb8ae00
DB
45extern const char *commit_type;
46
ca135e7a 47/* While we can decorate any object with a name, it's only used for commits.. */
ca135e7a
LT
48struct name_decoration {
49 struct name_decoration *next;
eb3005e2 50 int type;
2e3dfb21 51 char name[FLEX_ARRAY];
ca135e7a
LT
52};
53
662174d2
JK
54enum 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);
2608c249 65const struct name_decoration *get_name_decoration(const struct object *obj);
662174d2 66
b8dbfd03
PW
67/*
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 */
bacf1687 80struct commit *lookup_commit(struct repository *r, const struct object_id *oid);
1f6c72fe
SB
81struct commit *lookup_commit_reference(struct repository *r,
82 const struct object_id *oid);
d9a05e74 83struct commit *lookup_commit_reference_gently(struct repository *r,
21e1ee8f 84 const struct object_id *oid,
f76412ed 85 int quiet);
a6fa5992 86struct commit *lookup_commit_reference_by_name(const char *name);
6eb8ae00 87
baf18fc2 88/*
bc83266a 89 * Look up object named by "oid", dereference tag as necessary,
90 * get a commit and return it. If "oid" does not dereference to
baf18fc2
NTND
91 * a commit, use ref_name to report an error and die.
92 */
bc83266a 93struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
baf18fc2 94
fd8030c7 95int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph);
9e5252ab
SB
96int 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)
9cc2b07a 102{
9e5252ab 103 return repo_parse_commit_gently(r, item, 0);
9cc2b07a 104}
43d35618 105
c4cc0831
DS
106static inline int repo_parse_commit_no_graph(struct repository *r,
107 struct commit *commit)
43d35618 108{
c4cc0831 109 return repo_parse_commit_internal(r, commit, 0, 0);
43d35618
ÆAB
110}
111
9e5252ab
SB
112#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
113#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
9e5252ab
SB
114#define parse_commit(item) repo_parse_commit(the_repository, item)
115#endif
116
7059dccc 117void parse_commit_or_die(struct commit *item);
6eb8ae00 118
65ea9d4b
SB
119struct buffer_slab;
120struct buffer_slab *allocate_commit_buffer_slab(void);
121void free_commit_buffer_slab(struct buffer_slab *bs);
122
66c2827e
JK
123/*
124 * 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 */
1a40fc45 127void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
66c2827e 128
152ff1cc
JK
129/*
130 * Get any cached object buffer associated with the commit. Returns NULL
131 * if none. The resulting memory should not be freed.
132 */
4ff7e5c9 133const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
152ff1cc
JK
134
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 */
07de3fd8
SB
140const 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
152ff1cc
JK
146
147/*
15beaaa3 148 * Tell the commit subsystem that we are done with a particular commit buffer.
152ff1cc
JK
149 * 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 */
70315373
SB
153void 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
152ff1cc 159
0fb370da
JK
160/*
161 * Free any cached object buffer associated with the commit.
162 */
6a7895fd 163void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
0fb370da 164
301b8c7f
NTND
165struct tree *repo_get_commit_tree(struct repository *, const struct commit *);
166#define get_commit_tree(c) repo_get_commit_tree(the_repository, c)
5bb03de1
DS
167struct object_id *get_commit_tree_oid(const struct commit *);
168
14ba97f8
SB
169/*
170 * Release memory related to a commit, including the parent list and
171 * any cached object buffer.
172 */
6a7895fd 173void release_commit_memory(struct parsed_object_pool *pool, struct commit *c);
14ba97f8 174
0fb370da
JK
175/*
176 * Disassociate any cached object buffer from the commit, but do not free it.
177 * The buffer (or NULL, if none) is returned.
178 */
8597ea3a 179const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
0fb370da 180
11af2aae
CC
181/* Find beginning and length of commit subject. */
182int find_commit_subject(const char *commit_buffer, const char **subject);
183
6e0e2887
CM
184/* Return length of the commit subject from commit log message. */
185size_t commit_subject_length(const char *body);
186
47e44ed1
TF
187struct commit_list *commit_list_insert(struct commit *item,
188 struct commit_list **list);
597b2c39
DS
189int commit_list_contains(struct commit *item,
190 struct commit_list *list);
89b5f1d9
RS
191struct commit_list **commit_list_append(struct commit *commit,
192 struct commit_list **next);
65319475 193unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
194struct 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);
dd97f850 197
53d00b39
TR
198/* Shallow copy of the input list */
199struct commit_list *copy_commit_list(struct commit_list *list);
200
b0ca1205
EN
201/* 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
6eb8ae00
DB
204void free_commit_list(struct commit_list *list);
205
6d167fd7
RS
206struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
207
55454427 208const char *logmsg_reencode(const struct commit *commit,
ad6dad09
DL
209 char **commit_encoding,
210 const char *output_encoding);
424510ed
SB
211const char *repo_logmsg_reencode(struct repository *r,
212 const struct commit *commit,
213 char **commit_encoding,
214 const char *output_encoding);
215#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
216#define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out)
217#endif
218
55454427 219const char *skip_blank_lines(const char *msg);
e3bc7a3b 220
dd97f850
DB
221/** Removes the first commit from a list sorted by date, and adds all
222 * of its parents.
223 **/
a6080a0a 224struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 225 unsigned int mark);
dd97f850 226
a3437b8c
JS
227struct commit *pop_commit(struct commit_list **stack);
228
f8f9c73c 229void clear_commit_marks(struct commit *commit, unsigned int mark);
e895cb51 230void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
f8f9c73c 231
08f704f2
JH
232
233enum rev_sort_order {
234 REV_SORT_IN_GRAPH_ORDER = 0,
81c6b38b
JH
235 REV_SORT_BY_COMMIT_DATE,
236 REV_SORT_BY_AUTHOR_DATE
08f704f2
JH
237};
238
ab580ace
JS
239/*
240 * Performs an in-place topological sort of list supplied.
241 *
ab580ace
JS
242 * invariant of resulting list is:
243 * a reachable from b => ord(b) < ord(a)
08f704f2
JH
244 * sort_order further specifies:
245 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
246 * chain together.
247 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
ab580ace 248 */
08f704f2 249void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
5040f17e
JH
250
251struct commit_graft {
7683e2e6 252 struct object_id oid;
ed09aef0 253 int nr_parent; /* < 0 if shallow commit */
7683e2e6 254 struct object_id parent[FLEX_ARRAY]; /* more */
5040f17e 255};
09d46644 256typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
5040f17e 257
9a934032 258struct commit_graft *read_graft_line(struct strbuf *line);
183df649 259/* commit_graft_pos returns an index into r->parsed_objects->grafts. */
98c431b6 260int commit_graft_pos(struct repository *r, const struct object_id *oid);
a3b78e83 261int register_commit_graft(struct repository *r, struct commit_graft *, int);
20fd6d57 262void prepare_commit_graft(struct repository *r);
b9dbddf6 263struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
2a69ff09 264void reset_commit_grafts(struct repository *r);
5040f17e 265
103148aa
PK
266struct commit *get_fork_point(const char *refname, struct commit *commit);
267
41ccfdd9 268/* largest positive number a signed 32-bit integer can contain */
4dcb167f
NTND
269#define INFINITE_DEPTH 0x7fffffff
270
910650d2 271struct oid_array;
58babfff 272struct ref;
55454427 273int for_each_commit_graft(each_commit_graft_fn, void *);
ed09aef0 274
e885a84f 275int interactive_add(const char **argv, const char *prefix, int patch);
58680165 276
5231c633
JH
277struct commit_extra_header {
278 struct commit_extra_header *next;
279 char *key;
280 char *value;
281 size_t len;
282};
283
55454427 284void append_merge_tag_headers(struct commit_list *parents,
ad6dad09 285 struct commit_extra_header ***tail);
5231c633 286
55454427 287int commit_tree(const char *msg, size_t msg_len,
ad6dad09
DL
288 const struct object_id *tree,
289 struct commit_list *parents, struct object_id *ret,
290 const char *author, const char *sign_commit);
5231c633 291
55454427 292int commit_tree_extended(const char *msg, size_t msg_len,
ad6dad09 293 const struct object_id *tree,
e8cbe211
PW
294 struct commit_list *parents, struct object_id *ret,
295 const char *author, const char *committer,
296 const char *sign_commit, struct commit_extra_header *);
5231c633 297
55454427 298struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
ed7a42a0 299
55454427 300void free_commit_extra_headers(struct commit_extra_header *extra);
40d52ff7 301
fe6eb7f2
JK
302/*
303 * Search the commit object contents given by "msg" for the header "key".
cfc5cf42 304 * Reads up to "len" bytes of "msg".
fe6eb7f2
JK
305 * Returns a pointer to the start of the header contents, or NULL. The length
306 * of the header, up to the first newline, is returned via out_len.
307 *
308 * Note that some headers (like mergetag) may be multi-line. It is the caller's
309 * responsibility to parse further in this case!
310 */
cfc5cf42
JC
311const char *find_header_mem(const char *msg, size_t len,
312 const char *key,
313 size_t *out_len);
314
55454427 315const char *find_commit_header(const char *msg, const char *key,
ad6dad09 316 size_t *out_len);
fe6eb7f2 317
8c384589 318/* Find the end of the log message, the right place for a new trailer. */
55454427 319size_t ignore_non_trailer(const char *buf, size_t len);
8c384589 320
fef461ea 321typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
ad6dad09 322 void *cb_data);
063da62b 323
55454427 324int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
063da62b 325
ae8e4c9c
JH
326struct merge_remote_desc {
327 struct object *obj; /* the named object, could be a tag */
5447a76a 328 char name[FLEX_ARRAY];
ae8e4c9c 329};
55454427
DL
330struct merge_remote_desc *merge_remote_util(struct commit *);
331void set_merge_remote_desc(struct commit *commit,
ad6dad09 332 const char *name, struct object *obj);
ae8e4c9c
JH
333
334/*
335 * Given "name" from the command line to merge, find the commit object
336 * and return it, while storing merge_remote_desc in its ->util field,
337 * to allow callers to tell if we are told to merge a tag.
338 */
339struct commit *get_merge_parent(const char *name);
340
55454427 341int parse_signed_commit(const struct commit *commit,
1fb5cf0d 342 struct strbuf *message, struct strbuf *signature,
343 const struct git_hash_algo *algop);
55454427 344int remove_signature(struct strbuf *buf);
0b05ab6f 345
ffb6d7d5 346/*
eb307ae7
SG
347 * Check the signature of the given commit. The result of the check is stored
348 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
349 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
350 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
351 * sig->signer and sig->key.
ffb6d7d5 352 */
55454427 353int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
ffb6d7d5 354
5284fc5c
DS
355/* record author-date for each commit object */
356struct author_date_slab;
357void record_author_date(struct author_date_slab *author_date,
358 struct commit *commit);
359
360int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);
6d2035ee 361
edc4d47d
JK
362/*
363 * Verify a single commit with check_commit_signature() and die() if it is not
364 * a good signature. This isn't really suitable for general use, but is a
365 * helper to implement consistent logic for pull/merge --verify-signatures.
54887b46
HJI
366 *
367 * The check_trust parameter is meant for backward-compatibility. The GPG
368 * interface verifies key trust with a default trust level that is below the
369 * default trust level for merge operations. Its value should be non-zero if
370 * the user hasn't set a minimum trust level explicitly in their configuration.
371 *
372 * If the user has set a minimum trust level, then that value should be obeyed
373 * and check_trust should be zero, even if the configured trust level is below
374 * the default trust level for merges.
edc4d47d 375 */
54887b46
HJI
376void verify_merge_signature(struct commit *commit, int verbose,
377 int check_trust);
edc4d47d 378
727377ff 379int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
3afc679b 380int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
727377ff 381
15048f8a 382LAST_ARG_MUST_BE_NULL
a8cc5943
ÆAB
383int run_commit_hook(int editor_is_used, const char *index_file,
384 int *invoked_hook, const char *name, ...);
15048f8a 385
937032e1 386/* Sign a commit or tag buffer, storing the result in a header. */
387int sign_with_header(struct strbuf *buf, const char *keyid);
388/* Parse the signature out of a header. */
389int parse_buffer_signed_by_header(const char *buffer,
390 unsigned long size,
391 struct strbuf *payload,
392 struct strbuf *signature,
393 const struct git_hash_algo *algop);
394
6eb8ae00 395#endif /* COMMIT_H */