]> git.ipfire.org Git - thirdparty/git.git/blame - commit.h
Git 2.2.2
[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"
6eb8ae00
DB
10
11struct commit_list {
12 struct commit *item;
13 struct commit_list *next;
14};
15
16struct commit {
17 struct object object;
d3ff6f55 18 void *util;
96c4f4a3 19 unsigned int index;
6eb8ae00
DB
20 unsigned long date;
21 struct commit_list *parents;
22 struct tree *tree;
23};
24
60ab26de 25extern int save_commit_buffer;
6eb8ae00
DB
26extern const char *commit_type;
27
ca135e7a 28/* While we can decorate any object with a name, it's only used for commits.. */
ca135e7a
LT
29struct name_decoration {
30 struct name_decoration *next;
eb3005e2 31 int type;
2e3dfb21 32 char name[FLEX_ARRAY];
ca135e7a
LT
33};
34
662174d2
JK
35enum 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);
2608c249 46const struct name_decoration *get_name_decoration(const struct object *obj);
662174d2 47
5d6ccf5c
JM
48struct commit *lookup_commit(const unsigned char *sha1);
49struct commit *lookup_commit_reference(const unsigned char *sha1);
f76412ed
JH
50struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
51 int quiet);
a6fa5992 52struct commit *lookup_commit_reference_by_name(const char *name);
6eb8ae00 53
baf18fc2
NTND
54/*
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
cf7b1cad 61int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
6eb8ae00 62int parse_commit(struct commit *item);
7059dccc 63void parse_commit_or_die(struct commit *item);
6eb8ae00 64
66c2827e
JK
65/*
66 * Associate an object buffer with the commit. The ownership of the
67 * memory is handed over to the commit, and must be free()-able.
68 */
8597ea3a 69void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
66c2827e 70
152ff1cc
JK
71/*
72 * Get any cached object buffer associated with the commit. Returns NULL
73 * if none. The resulting memory should not be freed.
74 */
8597ea3a 75const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
152ff1cc
JK
76
77/*
78 * Get the commit's object contents, either from cache or by reading the object
79 * from disk. The resulting memory should not be modified, and must be given
80 * to unuse_commit_buffer when the caller is done.
81 */
8597ea3a 82const void *get_commit_buffer(const struct commit *, unsigned long *size);
152ff1cc
JK
83
84/*
85 * Tell the commit subsytem that we are done with a particular commit buffer.
86 * The commit and buffer should be the input and return value, respectively,
87 * from an earlier call to get_commit_buffer. The buffer may or may not be
88 * freed by this call; callers should not access the memory afterwards.
89 */
90void unuse_commit_buffer(const struct commit *, const void *buffer);
91
0fb370da
JK
92/*
93 * Free any cached object buffer associated with the commit.
94 */
95void free_commit_buffer(struct commit *);
96
97/*
98 * Disassociate any cached object buffer from the commit, but do not free it.
99 * The buffer (or NULL, if none) is returned.
100 */
8597ea3a 101const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
0fb370da 102
11af2aae
CC
103/* Find beginning and length of commit subject. */
104int find_commit_subject(const char *commit_buffer, const char **subject);
105
47e44ed1
TF
106struct commit_list *commit_list_insert(struct commit *item,
107 struct commit_list **list);
89b5f1d9
RS
108struct commit_list **commit_list_append(struct commit *commit,
109 struct commit_list **next);
65319475 110unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
111struct commit_list *commit_list_insert_by_date(struct commit *item,
112 struct commit_list **list);
113void commit_list_sort_by_date(struct commit_list **list);
dd97f850 114
53d00b39
TR
115/* Shallow copy of the input list */
116struct commit_list *copy_commit_list(struct commit_list *list);
117
6eb8ae00
DB
118void free_commit_list(struct commit_list *list);
119
000182ea
LT
120/* Commit formats */
121enum cmit_fmt {
122 CMIT_FMT_RAW,
123 CMIT_FMT_MEDIUM,
124 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
9b66ec04
LT
125 CMIT_FMT_SHORT,
126 CMIT_FMT_FULL,
ff56fe1c 127 CMIT_FMT_FULLER,
d87449c5 128 CMIT_FMT_ONELINE,
3eefc189 129 CMIT_FMT_EMAIL,
e52a5de4 130 CMIT_FMT_USERFORMAT,
6b9c58f4 131
4b05548f 132 CMIT_FMT_UNSPECIFIED
000182ea
LT
133};
134
9cba13ca 135struct pretty_print_context {
10f2fbff
JK
136 /*
137 * Callers should tweak these to change the behavior of pp_* functions.
138 */
6bf13944 139 enum cmit_fmt fmt;
dd2e794a
TR
140 int abbrev;
141 const char *subject;
142 const char *after_subject;
9553d2b2 143 int preserve_subject;
dd2e794a 144 enum date_mode date_mode;
f026c756 145 unsigned date_mode_explicit:1;
dd2e794a 146 int need_8bit_cte;
ddf333f6 147 char *notes_message;
8f8f5476 148 struct reflog_walk_info *reflog_info;
177b29dc 149 const char *output_encoding;
0e2913b0 150 struct string_list *mailmap;
30825178 151 int color;
a9080475 152 struct ident_split *from_ident;
10f2fbff
JK
153
154 /*
155 * Fields below here are manipulated internally by pp_* functions and
156 * should not be counted on by callers.
157 */
a9080475 158 struct string_list in_body_headers;
dd2e794a
TR
159};
160
5b163603
JG
161struct userformat_want {
162 unsigned notes:1;
163};
164
28e9cf65 165extern int has_non_ascii(const char *text);
4da45bef 166struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
b000c59b
JK
167extern const char *logmsg_reencode(const struct commit *commit,
168 char **commit_encoding,
169 const char *output_encoding);
4da45bef 170extern void get_commit_format(const char *arg, struct rev_info *);
c8f1444d
RJ
171extern const char *format_subject(struct strbuf *sb, const char *msg,
172 const char *line_separator);
5b163603 173extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
b9c7d6e4 174extern int commit_format_is_empty(enum cmit_fmt);
674d1727 175extern void format_commit_message(const struct commit *commit,
7f98ebc8 176 const char *format, struct strbuf *sb,
dd2e794a 177 const struct pretty_print_context *context);
10f2fbff 178extern void pretty_print_commit(struct pretty_print_context *pp,
6bf13944
JK
179 const struct commit *commit,
180 struct strbuf *sb);
8b8a5374
JK
181extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
182 struct strbuf *sb);
10f2fbff 183void pp_user_info(struct pretty_print_context *pp,
6bf13944
JK
184 const char *what, struct strbuf *sb,
185 const char *line, const char *encoding);
10f2fbff 186void pp_title_line(struct pretty_print_context *pp,
b02bd65f
DB
187 const char **msg_p,
188 struct strbuf *sb,
b02bd65f 189 const char *encoding,
267123b4 190 int need_8bit_cte);
10f2fbff 191void pp_remainder(struct pretty_print_context *pp,
b02bd65f
DB
192 const char **msg_p,
193 struct strbuf *sb,
194 int indent);
195
e3bc7a3b 196
dd97f850
DB
197/** Removes the first commit from a list sorted by date, and adds all
198 * of its parents.
199 **/
a6080a0a 200struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 201 unsigned int mark);
dd97f850 202
a3437b8c
JS
203struct commit *pop_commit(struct commit_list **stack);
204
f8f9c73c 205void clear_commit_marks(struct commit *commit, unsigned int mark);
e895cb51 206void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
86a0a408 207void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
f8f9c73c 208
08f704f2
JH
209
210enum rev_sort_order {
211 REV_SORT_IN_GRAPH_ORDER = 0,
81c6b38b
JH
212 REV_SORT_BY_COMMIT_DATE,
213 REV_SORT_BY_AUTHOR_DATE
08f704f2
JH
214};
215
ab580ace
JS
216/*
217 * Performs an in-place topological sort of list supplied.
218 *
ab580ace
JS
219 * invariant of resulting list is:
220 * a reachable from b => ord(b) < ord(a)
08f704f2
JH
221 * sort_order further specifies:
222 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
223 * chain together.
224 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
ab580ace 225 */
08f704f2 226void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
5040f17e
JH
227
228struct commit_graft {
229 unsigned char sha1[20];
ed09aef0 230 int nr_parent; /* < 0 if shallow commit */
5040f17e
JH
231 unsigned char parent[FLEX_ARRAY][20]; /* more */
232};
09d46644 233typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
5040f17e
JH
234
235struct commit_graft *read_graft_line(char *buf, int len);
236int register_commit_graft(struct commit_graft *, int);
45163382 237struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
5040f17e 238
c0fa8255 239extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
53eda89b 240extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
5240c9d7 241extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
7c6f8aaf 242
41ccfdd9 243/* largest positive number a signed 32-bit integer can contain */
4dcb167f
NTND
244#define INFINITE_DEPTH 0x7fffffff
245
58babfff
NTND
246struct sha1_array;
247struct ref;
ed09aef0 248extern int register_shallow(const unsigned char *sha1);
f53514bc 249extern int unregister_shallow(const unsigned char *sha1);
09d46644 250extern int for_each_commit_graft(each_commit_graft_fn, void *);
f43117a6 251extern int is_repository_shallow(void);
ed09aef0 252extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514bc 253 int depth, int shallow_flag, int not_shallow_flag);
6035d6aa 254extern void check_shallow_file_for_update(void);
069c0532 255extern void set_alternate_shallow_file(const char *path, int override);
1a30f5a2
NTND
256extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
257 const struct sha1_array *extra);
3125fe52 258extern void setup_alternate_shallow(struct lock_file *shallow_lock,
1a30f5a2
NTND
259 const char **alternate_shallow_file,
260 const struct sha1_array *extra);
0179c945 261extern const char *setup_temporary_shallow(const struct sha1_array *extra);
ad491366 262extern void advertise_shallow_grafts(int);
ed09aef0 263
58babfff
NTND
264struct shallow_info {
265 struct sha1_array *shallow;
266 int *ours, nr_ours;
267 int *theirs, nr_theirs;
268 struct sha1_array *ref;
0a1bc12b
NTND
269
270 /* for receive-pack */
271 uint32_t **used_shallow;
272 int *need_reachability_test;
273 int *reachable;
274 int *shallow_ref;
275 struct commit **commits;
276 int nr_commits;
58babfff
NTND
277};
278
279extern void prepare_shallow_info(struct shallow_info *, struct sha1_array *);
280extern void clear_shallow_info(struct shallow_info *);
281extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
8e277383
NTND
282extern void assign_shallow_commits_to_refs(struct shallow_info *info,
283 uint32_t **used,
284 int *ref_status);
0a1bc12b 285extern int delayed_reachability_test(struct shallow_info *si, int c);
eab3296c 286extern void prune_shallow(int show_only);
6aa30857 287extern struct trace_key trace_shallow;
ed09aef0 288
7fcdb36e 289int is_descendant_of(struct commit *, struct commit_list *);
a20efee9 290int in_merge_bases(struct commit *, struct commit *);
4c4b27e8 291int in_merge_bases_many(struct commit *, int, struct commit **);
58680165 292
b4bd4668 293extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
46b5139c 294extern int run_add_interactive(const char *revision, const char *patch_mode,
480ca644 295 const struct pathspec *pathspec);
58680165 296
53b2c823
LT
297static inline int single_parent(struct commit *commit)
298{
299 return commit->parents && !commit->parents->next;
300}
301
98cf9c3b
JH
302struct commit_list *reduce_heads(struct commit_list *heads);
303
5231c633
JH
304struct commit_extra_header {
305 struct commit_extra_header *next;
306 char *key;
307 char *value;
308 size_t len;
309};
310
311extern void append_merge_tag_headers(struct commit_list *parents,
312 struct commit_extra_header ***tail);
313
3ffefb54
JK
314extern int commit_tree(const char *msg, size_t msg_len,
315 const unsigned char *tree,
5231c633 316 struct commit_list *parents, unsigned char *ret,
ba3c69a9 317 const char *author, const char *sign_commit);
5231c633 318
3ffefb54
JK
319extern int commit_tree_extended(const char *msg, size_t msg_len,
320 const unsigned char *tree,
5231c633 321 struct commit_list *parents, unsigned char *ret,
ba3c69a9 322 const char *author, const char *sign_commit,
5231c633
JH
323 struct commit_extra_header *);
324
c871a1d1 325extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
ed7a42a0 326
5231c633 327extern void free_commit_extra_headers(struct commit_extra_header *extra);
40d52ff7 328
fe6eb7f2
JK
329/*
330 * Search the commit object contents given by "msg" for the header "key".
331 * Returns a pointer to the start of the header contents, or NULL. The length
332 * of the header, up to the first newline, is returned via out_len.
333 *
334 * Note that some headers (like mergetag) may be multi-line. It is the caller's
335 * responsibility to parse further in this case!
336 */
337extern const char *find_commit_header(const char *msg, const char *key,
338 size_t *out_len);
339
063da62b
CC
340typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
341 void *cb_data);
342
343extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
344
ae8e4c9c
JH
345struct merge_remote_desc {
346 struct object *obj; /* the named object, could be a tag */
347 const char *name;
348};
349#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
350
351/*
352 * Given "name" from the command line to merge, find the commit object
353 * and return it, while storing merge_remote_desc in its ->util field,
354 * to allow callers to tell if we are told to merge a tag.
355 */
356struct commit *get_merge_parent(const char *name);
357
218aa3a6 358extern int parse_signed_commit(const struct commit *commit,
0c37f1fc 359 struct strbuf *message, struct strbuf *signature);
0b05ab6f
CC
360extern int remove_signature(struct strbuf *buf);
361
efc7df45
NTND
362extern void print_commit_list(struct commit_list *list,
363 const char *format_cur,
364 const char *format_last);
365
ffb6d7d5 366/*
eb307ae7
SG
367 * Check the signature of the given commit. The result of the check is stored
368 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
369 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
370 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
371 * sig->signer and sig->key.
ffb6d7d5 372 */
24d36f14 373extern void check_commit_signature(const struct commit *commit, struct signature_check *sigc);
ffb6d7d5 374
727377ff
JK
375int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
376
15048f8a
BP
377LAST_ARG_MUST_BE_NULL
378extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
379
6eb8ae00 380#endif /* COMMIT_H */