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