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