🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.43.1 / . / commit.c
blob: ef679a0b939046c4aac15567cdf3c0ae8c079d29 [file] [log] [blame]
Elijah Newrend812c3b2023-04-11 07:41:56[diff] [blame]1#include "git-compat-util.h"
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]2#include "tag.h"
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]3#include "commit.h"
Derrick Stolee177722b2018-04-10 12:56:05[diff] [blame]4#include "commit-graph.h"
Elijah Newren7ee24e12023-03-21 06:25:57[diff] [blame]5#include "environment.h"
Elijah Newrenf394e092023-03-21 06:25:54[diff] [blame]6#include "gettext.h"
Elijah Newren41771fa2023-02-24 00:09:27[diff] [blame]7#include "hex.h"
Jonathan Nieder6a1a79f2018-05-15 23:42:16[diff] [blame]8#include "repository.h"
Elijah Newrendabab1d2023-04-11 07:41:49[diff] [blame]9#include "object-name.h"
Elijah Newrena034e912023-05-16 06:34:06[diff] [blame]10#include "object-store-ll.h"
Junio C Hamano52883fb2006-12-25 19:48:35[diff] [blame]11#include "utf8.h"
Junio C Hamano199c45b2007-04-09 09:34:05[diff] [blame]12#include "diff.h"
13#include "revision.h"
Johannes Schindelina97a7462009-10-09 10:21:57[diff] [blame]14#include "notes.h"
Stefan Beller14ba97f2018-05-15 21:48:42[diff] [blame]15#include "alloc.h"
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]16#include "gpg-interface.h"
René Scharfe46905892012-03-31 22:10:39[diff] [blame]17#include "mergesort.h"
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]18#include "commit-slab.h"
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]19#include "prio-queue.h"
Martin Ågrenbc626922020-12-31 11:56:23[diff] [blame]20#include "hash-lookup.h"
Brian Malehornd76650b2017-05-16 06:06:49[diff] [blame]21#include "wt-status.h"
Johannes Schindelinf9f99b32018-04-28 22:44:44[diff] [blame]22#include "advice.h"
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]23#include "refs.h"
Junio C Hamano02931212018-11-02 02:04:55[diff] [blame]24#include "commit-reach.h"
Elijah Newrene38da482023-03-21 06:26:05[diff] [blame]25#include "setup.h"
Taylor Blau120ad2b2020-04-30 19:48:50[diff] [blame]26#include "shallow.h"
Elijah Newrend4a4f922023-04-22 20:17:26[diff] [blame]27#include "tree.h"
Emily Shafferf4432462021-12-22 03:59:40[diff] [blame]28#include "hook.h"
Patrick Steinhardt7a5d6042023-10-31 07:16:18[diff] [blame]29#include "parse.h"
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]30
Junio C Hamano82a75292012-09-15 20:58:15[diff] [blame]31static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
32
Linus Torvalds60ab26d2005-09-15 21:43:17[diff] [blame]33int save_commit_buffer = 1;
Ævar Arnfjörð Bjarmasonab628582021-08-23 10:44:02[diff] [blame]34int no_graft_file_deprecated_advice;
Linus Torvalds60ab26d2005-09-15 21:43:17[diff] [blame]35
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]36const char *commit_type = "commit";
37
Stefan Bellerd9a05e72018-06-29 01:22:21[diff] [blame]38struct commit *lookup_commit_reference_gently(struct repository *r,
Stefan Beller21e1ee82018-06-29 01:21:57[diff] [blame]39 const struct object_id *oid, int quiet)
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]40{
Stefan Bellerd9a05e72018-06-29 01:22:21[diff] [blame]41 struct object *obj = deref_tag(r,
42 parse_object(r, oid),
Stefan Beller109cd762018-06-29 01:21:51[diff] [blame]43 NULL, 0);
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]44
45 if (!obj)
46 return NULL;
Abhishek Kumar6da43d92020-06-17 09:14:08[diff] [blame]47 return object_as_type(obj, OBJ_COMMIT, quiet);
Junio C Hamanof76412e2005-08-21 09:51:10[diff] [blame]48}
49
Stefan Beller1f6c72f2018-06-29 01:22:22[diff] [blame]50struct commit *lookup_commit_reference(struct repository *r, const struct object_id *oid)
Junio C Hamanof76412e2005-08-21 09:51:10[diff] [blame]51{
Stefan Beller1f6c72f2018-06-29 01:22:22[diff] [blame]52 return lookup_commit_reference_gently(r, oid, 0);
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]53}
54
brian m. carlsonbc832662017-05-06 22:10:10[diff] [blame]55struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name)
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]56{
Stefan Beller2122f672018-06-29 01:21:58[diff] [blame]57 struct commit *c = lookup_commit_reference(the_repository, oid);
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]58 if (!c)
59 die(_("could not parse %s"), ref_name);
Jeff King9001dc22018-08-28 21:22:48[diff] [blame]60 if (!oideq(oid, &c->object.oid)) {
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]61 warning(_("%s %s is not a commit!"),
brian m. carlsonbc832662017-05-06 22:10:10[diff] [blame]62 ref_name, oid_to_hex(oid));
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]63 }
64 return c;
65}
66
Phillip Woodb8dbfd02022-10-17 13:17:40[diff] [blame]67struct commit *lookup_commit_object(struct repository *r,
68 const struct object_id *oid)
69{
70 struct object *obj = parse_object(r, oid);
71 return obj ? object_as_type(obj, OBJ_COMMIT, 0) : NULL;
72
73}
74
Stefan Bellerbacf1682018-06-29 01:22:10[diff] [blame]75struct commit *lookup_commit(struct repository *r, const struct object_id *oid)
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]76{
Jeff Kingd0229ab2019-06-20 07:41:14[diff] [blame]77 struct object *obj = lookup_object(r, oid);
Jeff Kingd36f51c2014-07-13 06:41:55[diff] [blame]78 if (!obj)
Jeff Kinga3785092019-06-20 07:41:21[diff] [blame]79 return create_object(r, oid, alloc_commit_node(r));
Abhishek Kumar6da43d92020-06-17 09:14:08[diff] [blame]80 return object_as_type(obj, OBJ_COMMIT, 0);
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]81}
82
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]83struct commit *lookup_commit_reference_by_name(const char *name)
84{
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]85 struct object_id oid;
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]86 struct commit *commit;
87
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 13:58:46[diff] [blame]88 if (repo_get_oid_committish(the_repository, name, &oid))
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]89 return NULL;
Stefan Beller2122f672018-06-29 01:21:58[diff] [blame]90 commit = lookup_commit_reference(the_repository, &oid);
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]91 if (repo_parse_commit(the_repository, commit))
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]92 return NULL;
93 return commit;
94}
95
Johannes Schindelindddbad72017-04-26 19:29:31[diff] [blame]96static timestamp_t parse_commit_date(const char *buf, const char *tail)
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]97{
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]98 const char *dateptr;
Jeff Kingea1615d2023-04-27 08:14:09[diff] [blame]99 const char *eol;
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]100
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]101 if (buf + 6 >= tail)
102 return 0;
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]103 if (memcmp(buf, "author", 6))
104 return 0;
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]105 while (buf < tail && *buf++ != '\n')
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]106 /* nada */;
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]107 if (buf + 9 >= tail)
108 return 0;
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]109 if (memcmp(buf, "committer", 9))
110 return 0;
Jeff Kingea1615d2023-04-27 08:14:09[diff] [blame]111
112 /*
113 * Jump to end-of-line so that we can walk backwards to find the
114 * end-of-email ">". This is more forgiving of malformed cases
115 * because unexpected characters tend to be in the name and email
116 * fields.
117 */
118 eol = memchr(buf, '\n', tail - buf);
119 if (!eol)
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]120 return 0;
Jeff Kingea1615d2023-04-27 08:14:09[diff] [blame]121 dateptr = eol;
122 while (dateptr > buf && dateptr[-1] != '>')
123 dateptr--;
Jeff King089d9ad2023-04-27 08:17:15[diff] [blame]124 if (dateptr == buf)
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]125 return 0;
Jeff Kingea1615d2023-04-27 08:14:09[diff] [blame]126
Jeff King089d9ad2023-04-27 08:17:15[diff] [blame]127 /*
128 * Trim leading whitespace, but make sure we have at least one
129 * non-whitespace character, as parse_timestamp() will otherwise walk
130 * right past the newline we found in "eol" when skipping whitespace
131 * itself.
132 *
133 * In theory it would be sufficient to allow any character not matched
134 * by isspace(), but there's a catch: our isspace() does not
135 * necessarily match the behavior of parse_timestamp(), as the latter
136 * is implemented by system routines which match more exotic control
137 * codes, or even locale-dependent sequences.
138 *
139 * Since we expect the timestamp to be a number, we can check for that.
140 * Anything else (e.g., a non-numeric token like "foo") would just
141 * cause parse_timestamp() to return 0 anyway.
142 */
143 while (dateptr < eol && isspace(*dateptr))
144 dateptr++;
145 if (!isdigit(*dateptr) && *dateptr != '-')
146 return 0;
147
148 /*
149 * We know there is at least one digit (or dash), so we'll begin
150 * parsing there and stop at worst case at eol.
Jeff King90ef0f12023-04-27 08:17:24[diff] [blame]151 *
152 * Note that we may feed parse_timestamp() extra characters here if the
153 * commit is malformed, and it will parse as far as it can. For
154 * example, "123foo456" would return "123". That might be questionable
155 * (versus returning "0"), but it would help in a hypothetical case
156 * like "123456+0100", where the whitespace from the timezone is
157 * missing. Since such syntactic errors may be baked into history and
158 * hard to correct now, let's err on trying to make our best guess
159 * here, rather than insist on perfect syntax.
Jeff King089d9ad2023-04-27 08:17:15[diff] [blame]160 */
Johannes Schindelin1aeb7e72017-04-21 10:45:44[diff] [blame]161 return parse_timestamp(dateptr, NULL, 10);
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]162}
163
Jeff King8380dcd2021-01-28 06:20:23[diff] [blame]164static const struct object_id *commit_graft_oid_access(size_t index, const void *table)
Dmitry S. Dolzhenko0a9136f2014-02-26 18:49:22[diff] [blame]165{
Jeff King8380dcd2021-01-28 06:20:23[diff] [blame]166 const struct commit_graft * const *commit_graft_table = table;
Jeff King45ee13b2021-01-28 06:19:42[diff] [blame]167 return &commit_graft_table[index]->oid;
Dmitry S. Dolzhenko0a9136f2014-02-26 18:49:22[diff] [blame]168}
169
Jeff King98c431b2021-01-28 06:12:35[diff] [blame]170int commit_graft_pos(struct repository *r, const struct object_id *oid)
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]171{
Jeff King45ee13b2021-01-28 06:19:42[diff] [blame]172 return oid_pos(oid, r->parsed_objects->grafts,
173 r->parsed_objects->grafts_nr,
174 commit_graft_oid_access);
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]175}
176
Jonathan Tan4d4e49f2022-06-06 17:54:37[diff] [blame]177static void unparse_commit(struct repository *r, const struct object_id *oid)
178{
179 struct commit *c = lookup_commit(r, oid);
180
181 if (!c->object.parsed)
182 return;
183 free_commit_list(c->parents);
184 c->parents = NULL;
185 c->object.parsed = 0;
186}
187
Brandon Williamsa3b78e82018-05-17 22:51:48[diff] [blame]188int register_commit_graft(struct repository *r, struct commit_graft *graft,
189 int ignore_dups)
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]190{
Jeff King98c431b2021-01-28 06:12:35[diff] [blame]191 int pos = commit_graft_pos(r, &graft->oid);
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]192
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]193 if (0 <= pos) {
194 if (ignore_dups)
195 free(graft);
196 else {
Brandon Williamsa3b78e82018-05-17 22:51:48[diff] [blame]197 free(r->parsed_objects->grafts[pos]);
198 r->parsed_objects->grafts[pos] = graft;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]199 }
200 return 1;
201 }
202 pos = -pos - 1;
Brandon Williamsa3b78e82018-05-17 22:51:48[diff] [blame]203 ALLOC_GROW(r->parsed_objects->grafts,
204 r->parsed_objects->grafts_nr + 1,
205 r->parsed_objects->grafts_alloc);
206 r->parsed_objects->grafts_nr++;
207 if (pos < r->parsed_objects->grafts_nr)
208 memmove(r->parsed_objects->grafts + pos + 1,
209 r->parsed_objects->grafts + pos,
210 (r->parsed_objects->grafts_nr - pos - 1) *
211 sizeof(*r->parsed_objects->grafts));
212 r->parsed_objects->grafts[pos] = graft;
Jonathan Tan4d4e49f2022-06-06 17:54:37[diff] [blame]213 unparse_commit(r, &graft->oid);
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]214 return 0;
215}
216
Patryk Obara9a934032017-08-18 18:33:12[diff] [blame]217struct commit_graft *read_graft_line(struct strbuf *line)
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]218{
219 /* The format is just "Commit Parent1 Parent2 ...\n" */
Patryk Obaracfa5bf12017-08-18 18:33:14[diff] [blame]220 int i, phase;
221 const char *tail = NULL;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]222 struct commit_graft *graft = NULL;
Patryk Obaracfa5bf12017-08-18 18:33:14[diff] [blame]223 struct object_id dummy_oid, *oid;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]224
Patryk Obara9a934032017-08-18 18:33:12[diff] [blame]225 strbuf_rtrim(line);
226 if (!line->len || line->buf[0] == '#')
Junio C Hamano5bc4ce52006-04-16 21:24:56[diff] [blame]227 return NULL;
Patryk Obaracfa5bf12017-08-18 18:33:14[diff] [blame]228 /*
229 * phase 0 verifies line, counts hashes in line and allocates graft
230 * phase 1 fills graft
231 */
232 for (phase = 0; phase < 2; phase++) {
233 oid = graft ? &graft->oid : &dummy_oid;
234 if (parse_oid_hex(line->buf, oid, &tail))
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]235 goto bad_graft_data;
Patryk Obaracfa5bf12017-08-18 18:33:14[diff] [blame]236 for (i = 0; *tail != '\0'; i++) {
237 oid = graft ? &graft->parent[i] : &dummy_oid;
238 if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
239 goto bad_graft_data;
240 }
241 if (!graft) {
242 graft = xmalloc(st_add(sizeof(*graft),
243 st_mult(sizeof(struct object_id), i)));
244 graft->nr_parent = i;
245 }
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]246 }
247 return graft;
Ralf Thielowdf5d43b2010-12-01 19:15:59[diff] [blame]248
249bad_graft_data:
Patryk Obara9a934032017-08-18 18:33:12[diff] [blame]250 error("bad graft data: %s", line->buf);
Patryk Obaracfa5bf12017-08-18 18:33:14[diff] [blame]251 assert(!graft);
Ralf Thielowdf5d43b2010-12-01 19:15:59[diff] [blame]252 return NULL;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]253}
254
Brandon Williamsd0e5dd02018-05-17 22:51:49[diff] [blame]255static int read_graft_file(struct repository *r, const char *graft_file)
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]256{
Nguyễn Thái Ngọc Duye9d983f2017-05-03 10:16:50[diff] [blame]257 FILE *fp = fopen_or_warn(graft_file, "r");
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]258 struct strbuf buf = STRBUF_INIT;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]259 if (!fp)
260 return -1;
Ævar Arnfjörð Bjarmasonab628582021-08-23 10:44:02[diff] [blame]261 if (!no_graft_file_deprecated_advice &&
262 advice_enabled(ADVICE_GRAFT_FILE_DEPRECATED))
Johannes Schindelinf9f99b32018-04-28 22:44:44[diff] [blame]263 advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n"
264 "and will be removed in a future Git version.\n"
265 "\n"
266 "Please use \"git replace --convert-graft-file\"\n"
267 "to convert the grafts into replace refs.\n"
268 "\n"
269 "Turn this message off by running\n"
270 "\"git config advice.graftFileDeprecated false\""));
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]271 while (!strbuf_getwholeline(&buf, fp, '\n')) {
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]272 /* The format is just "Commit Parent1 Parent2 ...\n" */
Patryk Obara9a934032017-08-18 18:33:12[diff] [blame]273 struct commit_graft *graft = read_graft_line(&buf);
Junio C Hamano5bc4ce52006-04-16 21:24:56[diff] [blame]274 if (!graft)
275 continue;
Brandon Williamsd0e5dd02018-05-17 22:51:49[diff] [blame]276 if (register_commit_graft(r, graft, 1))
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]277 error("duplicate graft data: %s", buf.buf);
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]278 }
279 fclose(fp);
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]280 strbuf_release(&buf);
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]281 return 0;
282}
283
Derrick Stolee20fd6d52018-08-20 18:24:30[diff] [blame]284void prepare_commit_graft(struct repository *r)
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]285{
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]286 char *graft_file;
287
Stefan Beller2f6c7672018-05-17 22:51:53[diff] [blame]288 if (r->parsed_objects->commit_graft_prepared)
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]289 return;
Jeff King14a9bd22018-05-31 22:42:53[diff] [blame]290 if (!startup_info->have_repository)
291 return;
292
Stefan Beller2f6c7672018-05-17 22:51:53[diff] [blame]293 graft_file = get_graft_file(r);
294 read_graft_file(r, graft_file);
Johannes Schindelined09aef2006-10-30 19:09:06[diff] [blame]295 /* make sure shallows are read */
Stefan Beller2f6c7672018-05-17 22:51:53[diff] [blame]296 is_repository_shallow(r);
297 r->parsed_objects->commit_graft_prepared = 1;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]298}
299
Stefan Bellerb9dbddf2018-05-17 22:51:54[diff] [blame]300struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid)
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]301{
302 int pos;
Stefan Bellerb9dbddf2018-05-17 22:51:54[diff] [blame]303 prepare_commit_graft(r);
Jeff King98c431b2021-01-28 06:12:35[diff] [blame]304 pos = commit_graft_pos(r, oid);
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]305 if (pos < 0)
306 return NULL;
Stefan Bellerb9dbddf2018-05-17 22:51:54[diff] [blame]307 return r->parsed_objects->grafts[pos];
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]308}
309
Nguyễn Thái Ngọc Duy09d46642011-08-18 12:29:35[diff] [blame]310int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
Johannes Schindelined09aef2006-10-30 19:09:06[diff] [blame]311{
Nguyễn Thái Ngọc Duy09d46642011-08-18 12:29:35[diff] [blame]312 int i, ret;
Jonathan Nieder6a1a79f2018-05-15 23:42:16[diff] [blame]313 for (i = ret = 0; i < the_repository->parsed_objects->grafts_nr && !ret; i++)
314 ret = fn(the_repository->parsed_objects->grafts[i], cb_data);
Nguyễn Thái Ngọc Duy09d46642011-08-18 12:29:35[diff] [blame]315 return ret;
Johannes Schindelined09aef2006-10-30 19:09:06[diff] [blame]316}
317
Jonathan Tan2a69ff02022-03-17 18:24:47[diff] [blame]318void reset_commit_grafts(struct repository *r)
319{
320 int i;
321
Jonathan Tan4d4e49f2022-06-06 17:54:37[diff] [blame]322 for (i = 0; i < r->parsed_objects->grafts_nr; i++) {
323 unparse_commit(r, &r->parsed_objects->grafts[i]->oid);
Jonathan Tan2a69ff02022-03-17 18:24:47[diff] [blame]324 free(r->parsed_objects->grafts[i]);
Jonathan Tan4d4e49f2022-06-06 17:54:37[diff] [blame]325 }
Jonathan Tan2a69ff02022-03-17 18:24:47[diff] [blame]326 r->parsed_objects->grafts_nr = 0;
327 r->parsed_objects->commit_graft_prepared = 0;
328}
329
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]330struct commit_buffer {
331 void *buffer;
332 unsigned long size;
333};
334define_commit_slab(buffer_slab, struct commit_buffer);
Jeff Kingc1b3c712014-06-10 21:43:02[diff] [blame]335
Stefan Beller65ea9d42018-06-29 01:22:15[diff] [blame]336struct buffer_slab *allocate_commit_buffer_slab(void)
Jeff King66c28272014-06-10 21:40:14[diff] [blame]337{
Stefan Beller65ea9d42018-06-29 01:22:15[diff] [blame]338 struct buffer_slab *bs = xmalloc(sizeof(*bs));
339 init_buffer_slab(bs);
340 return bs;
341}
342
343void free_commit_buffer_slab(struct buffer_slab *bs)
344{
345 clear_buffer_slab(bs);
346 free(bs);
347}
Jeff Kingc1b3c712014-06-10 21:43:02[diff] [blame]348
Stefan Beller1a40fc42018-06-29 01:22:16[diff] [blame]349void set_commit_buffer(struct repository *r, struct commit *commit, void *buffer, unsigned long size)
Jeff King66c28272014-06-10 21:40:14[diff] [blame]350{
Stefan Beller65ea9d42018-06-29 01:22:15[diff] [blame]351 struct commit_buffer *v = buffer_slab_at(
Stefan Beller1a40fc42018-06-29 01:22:16[diff] [blame]352 r->parsed_objects->buffer_slab, commit);
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]353 v->buffer = buffer;
354 v->size = size;
Jeff King66c28272014-06-10 21:40:14[diff] [blame]355}
356
Stefan Beller4ff7e5c2018-06-29 01:22:17[diff] [blame]357const void *get_cached_commit_buffer(struct repository *r, const struct commit *commit, unsigned long *sizep)
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]358{
Stefan Beller65ea9d42018-06-29 01:22:15[diff] [blame]359 struct commit_buffer *v = buffer_slab_peek(
Stefan Beller4ff7e5c2018-06-29 01:22:17[diff] [blame]360 r->parsed_objects->buffer_slab, commit);
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]361 if (!v) {
362 if (sizep)
363 *sizep = 0;
364 return NULL;
365 }
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]366 if (sizep)
367 *sizep = v->size;
368 return v->buffer;
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]369}
370
Stefan Beller07de3fd2018-11-14 00:12:57[diff] [blame]371const void *repo_get_commit_buffer(struct repository *r,
372 const struct commit *commit,
373 unsigned long *sizep)
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]374{
Stefan Beller07de3fd2018-11-14 00:12:57[diff] [blame]375 const void *ret = get_cached_commit_buffer(r, commit, sizep);
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]376 if (!ret) {
377 enum object_type type;
378 unsigned long size;
Stefan Beller07de3fd2018-11-14 00:12:57[diff] [blame]379 ret = repo_read_object_file(r, &commit->object.oid, &type, &size);
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]380 if (!ret)
381 die("cannot read commit object %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]382 oid_to_hex(&commit->object.oid));
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]383 if (type != OBJ_COMMIT)
384 die("expected commit for %s, got %s",
Brandon Williamsdebca9d2018-02-14 18:59:24[diff] [blame]385 oid_to_hex(&commit->object.oid), type_name(type));
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]386 if (sizep)
387 *sizep = size;
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]388 }
389 return ret;
390}
391
Stefan Beller70315372018-11-14 00:12:58[diff] [blame]392void repo_unuse_commit_buffer(struct repository *r,
393 const struct commit *commit,
394 const void *buffer)
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]395{
Stefan Beller65ea9d42018-06-29 01:22:15[diff] [blame]396 struct commit_buffer *v = buffer_slab_peek(
Stefan Beller70315372018-11-14 00:12:58[diff] [blame]397 r->parsed_objects->buffer_slab, commit);
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]398 if (!(v && v->buffer == buffer))
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]399 free((void *)buffer);
400}
401
Stefan Beller6a7895f2018-12-15 00:09:40[diff] [blame]402void free_commit_buffer(struct parsed_object_pool *pool, struct commit *commit)
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]403{
Stefan Beller65ea9d42018-06-29 01:22:15[diff] [blame]404 struct commit_buffer *v = buffer_slab_peek(
Stefan Beller6a7895f2018-12-15 00:09:40[diff] [blame]405 pool->buffer_slab, commit);
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]406 if (v) {
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46[diff] [blame]407 FREE_AND_NULL(v->buffer);
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]408 v->size = 0;
409 }
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]410}
411
Nguyễn Thái Ngọc Duya133c402019-04-16 09:33:18[diff] [blame]412static inline void set_commit_tree(struct commit *c, struct tree *t)
413{
414 c->maybe_tree = t;
415}
416
Nguyễn Thái Ngọc Duy301b8c72019-04-16 09:33:19[diff] [blame]417struct tree *repo_get_commit_tree(struct repository *r,
418 const struct commit *commit)
Derrick Stolee5bb03de2018-04-06 19:09:34[diff] [blame]419{
Derrick Stolee7b8a21d2018-04-06 19:09:46[diff] [blame]420 if (commit->maybe_tree || !commit->object.parsed)
421 return commit->maybe_tree;
422
Abhishek Kumarc49c82a2020-06-17 09:14:10[diff] [blame]423 if (commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH)
Junio C Hamanoea2dab12019-05-08 15:37:25[diff] [blame]424 return get_commit_tree_in_graph(r, commit);
Derrick Stolee7b8a21d2018-04-06 19:09:46[diff] [blame]425
Jeff King83487662019-04-10 02:13:20[diff] [blame]426 return NULL;
Derrick Stolee5bb03de2018-04-06 19:09:34[diff] [blame]427}
428
429struct object_id *get_commit_tree_oid(const struct commit *commit)
430{
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]431 struct tree *tree = repo_get_commit_tree(the_repository, commit);
Taylor Blau806278d2019-09-05 22:04:57[diff] [blame]432 return tree ? &tree->object.oid : NULL;
Derrick Stolee5bb03de2018-04-06 19:09:34[diff] [blame]433}
434
Stefan Beller6a7895f2018-12-15 00:09:40[diff] [blame]435void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
Stefan Beller14ba97f2018-05-15 21:48:42[diff] [blame]436{
Nguyễn Thái Ngọc Duya133c402019-04-16 09:33:18[diff] [blame]437 set_commit_tree(c, NULL);
Stefan Beller6a7895f2018-12-15 00:09:40[diff] [blame]438 free_commit_buffer(pool, c);
Mike Hommey9784f972019-08-26 02:01:37[diff] [blame]439 c->index = 0;
Stefan Beller14ba97f2018-05-15 21:48:42[diff] [blame]440 free_commit_list(c->parents);
Stefan Beller14ba97f2018-05-15 21:48:42[diff] [blame]441
442 c->object.parsed = 0;
443}
444
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]445const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]446{
Stefan Beller65ea9d42018-06-29 01:22:15[diff] [blame]447 struct commit_buffer *v = buffer_slab_peek(
448 the_repository->parsed_objects->buffer_slab, commit);
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]449 void *ret;
450
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]451 if (!v) {
452 if (sizep)
453 *sizep = 0;
454 return NULL;
455 }
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]456 ret = v->buffer;
457 if (sizep)
458 *sizep = v->size;
459
460 v->buffer = NULL;
461 v->size = 0;
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]462 return ret;
463}
464
Stefan Bellerfd8030c2018-06-29 01:22:13[diff] [blame]465int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph)
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]466{
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 10:52:20[diff] [blame]467 const char *tail = buffer;
468 const char *bufptr = buffer;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]469 struct object_id parent;
Linus Torvalds6c88be12005-06-21 03:26:03[diff] [blame]470 struct commit_list **pptr;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]471 struct commit_graft *graft;
brian m. carlson2770ccb2018-07-16 01:27:56[diff] [blame]472 const int tree_entry_len = the_hash_algo->hexsz + 5;
473 const int parent_entry_len = the_hash_algo->hexsz + 7;
Jeff King12736d22019-10-18 04:43:29[diff] [blame]474 struct tree *tree;
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]475
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]476 if (item->object.parsed)
477 return 0;
Ævar Arnfjörð Bjarmasonbf20fe42022-04-13 20:01:34[diff] [blame]478 /*
479 * Presumably this is leftover from an earlier failed parse;
480 * clear it out in preparation for us re-parsing (we'll hit the
481 * same error, but that's good, since it lets our caller know
482 * the result cannot be trusted.
483 */
484 free_commit_list(item->parents);
485 item->parents = NULL;
Jeff King228c78f2019-10-25 21:20:20[diff] [blame]486
Junio C Hamano3b44f152006-06-28 10:51:00[diff] [blame]487 tail += size;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]488 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
489 bufptr[tree_entry_len] != '\n')
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]490 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
brian m. carlson26ea3e72018-05-02 00:25:47[diff] [blame]491 if (get_oid_hex(bufptr + 5, &parent) < 0)
Junio C Hamanobd2afde2006-02-23 01:47:10[diff] [blame]492 return error("bad tree pointer in commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]493 oid_to_hex(&item->object.oid));
Jeff King12736d22019-10-18 04:43:29[diff] [blame]494 tree = lookup_tree(r, &parent);
495 if (!tree)
496 return error("bad tree pointer %s in commit %s",
497 oid_to_hex(&parent),
498 oid_to_hex(&item->object.oid));
499 set_commit_tree(item, tree);
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]500 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
Linus Torvalds6c88be12005-06-21 03:26:03[diff] [blame]501 pptr = &item->parents;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]502
Stefan Bellerfd8030c2018-06-29 01:22:13[diff] [blame]503 graft = lookup_commit_graft(r, &item->object.oid);
Taylor Blauce163642020-07-08 21:10:53[diff] [blame]504 if (graft)
505 r->parsed_objects->substituted_parent = 1;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]506 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
Linus Torvaldsf7cc77d2005-07-27 22:12:48[diff] [blame]507 struct commit *new_parent;
508
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]509 if (tail <= bufptr + parent_entry_len + 1 ||
brian m. carlson26ea3e72018-05-02 00:25:47[diff] [blame]510 get_oid_hex(bufptr + 7, &parent) ||
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]511 bufptr[parent_entry_len] != '\n')
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]512 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]513 bufptr += parent_entry_len + 1;
Johannes Schindelin7f3140c2009-07-23 15:33:49[diff] [blame]514 /*
515 * The clone is shallow if nr_parent < 0, and we must
516 * not traverse its real parents even when we unhide them.
517 */
René Scharfe3a5f3082023-07-21 12:41:56[diff] [blame]518 if (graft && (graft->nr_parent < 0 || !grafts_keep_true_parents))
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]519 continue;
Stefan Bellerfd8030c2018-06-29 01:22:13[diff] [blame]520 new_parent = lookup_commit(r, &parent);
Jeff Kingc78fe002019-10-18 04:42:13[diff] [blame]521 if (!new_parent)
522 return error("bad parent %s in commit %s",
523 oid_to_hex(&parent),
524 oid_to_hex(&item->object.oid));
525 pptr = &commit_list_insert(new_parent, pptr)->next;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]526 }
527 if (graft) {
528 int i;
529 struct commit *new_parent;
530 for (i = 0; i < graft->nr_parent; i++) {
Stefan Bellerfd8030c2018-06-29 01:22:13[diff] [blame]531 new_parent = lookup_commit(r,
Stefan Bellerc1f5eb42018-06-29 01:21:59[diff] [blame]532 &graft->parent[i]);
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]533 if (!new_parent)
Jeff Kingc78fe002019-10-18 04:42:13[diff] [blame]534 return error("bad graft parent %s in commit %s",
535 oid_to_hex(&graft->parent[i]),
536 oid_to_hex(&item->object.oid));
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]537 pptr = &commit_list_insert(new_parent, pptr)->next;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]538 }
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]539 }
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]540 item->date = parse_commit_date(bufptr, tail);
Junio C Hamano27dedf02005-11-17 05:32:44[diff] [blame]541
Derrick Stoleee2838d82018-05-01 12:47:13[diff] [blame]542 if (check_graph)
Derrick Stoleec7944052019-05-09 14:22:31[diff] [blame]543 load_commit_graph_info(r, item);
Derrick Stoleee2838d82018-05-01 12:47:13[diff] [blame]544
Jeff King228c78f2019-10-25 21:20:20[diff] [blame]545 item->object.parsed = 1;
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]546 return 0;
547}
548
Stefan Beller9e5252a2018-11-14 00:12:50[diff] [blame]549int repo_parse_commit_internal(struct repository *r,
550 struct commit *item,
551 int quiet_on_missing,
552 int use_commit_graph)
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]553{
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]554 enum object_type type;
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]555 void *buffer;
556 unsigned long size;
Jonathan Tan7e2ad1c2022-12-14 19:17:43[diff] [blame]557 struct object_info oi = {
558 .typep = &type,
559 .sizep = &size,
560 .contentp = &buffer,
561 };
562 /*
563 * Git does not support partial clones that exclude commits, so set
564 * OBJECT_INFO_SKIP_FETCH_OBJECT to fail fast when an object is missing.
565 */
566 int flags = OBJECT_INFO_LOOKUP_REPLACE | OBJECT_INFO_SKIP_FETCH_OBJECT |
567 OBJECT_INFO_DIE_IF_CORRUPT;
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]568 int ret;
569
Martin Koegler9786f682008-02-18 20:48:02[diff] [blame]570 if (!item)
571 return -1;
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]572 if (item->object.parsed)
573 return 0;
Patrick Steinhardt7a5d6042023-10-31 07:16:18[diff] [blame]574 if (use_commit_graph && parse_commit_in_graph(r, item)) {
575 static int commit_graph_paranoia = -1;
576
577 if (commit_graph_paranoia == -1)
Patrick Steinhardtb1df3b32023-11-24 11:08:21[diff] [blame]578 commit_graph_paranoia = git_env_bool(GIT_COMMIT_GRAPH_PARANOIA, 0);
Patrick Steinhardt7a5d6042023-10-31 07:16:18[diff] [blame]579
580 if (commit_graph_paranoia && !has_object(r, &item->object.oid, 0)) {
581 unparse_commit(r, &item->object.oid);
582 return quiet_on_missing ? -1 :
583 error(_("commit %s exists in commit-graph but not in the object database"),
584 oid_to_hex(&item->object.oid));
585 }
586
Derrick Stolee177722b2018-04-10 12:56:05[diff] [blame]587 return 0;
Patrick Steinhardt7a5d6042023-10-31 07:16:18[diff] [blame]588 }
Jonathan Tan7e2ad1c2022-12-14 19:17:43[diff] [blame]589
590 if (oid_object_info_extended(r, &item->object.oid, &oi, flags) < 0)
Jeff King9cc2b072015-06-01 09:56:26[diff] [blame]591 return quiet_on_missing ? -1 :
592 error("Could not read %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]593 oid_to_hex(&item->object.oid));
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]594 if (type != OBJ_COMMIT) {
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]595 free(buffer);
596 return error("Object %s not a commit",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]597 oid_to_hex(&item->object.oid));
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]598 }
Derrick Stolee9b19ada2018-06-27 13:24:30[diff] [blame]599
Stefan Beller9e5252a2018-11-14 00:12:50[diff] [blame]600 ret = parse_commit_buffer(r, item, buffer, size, 0);
Linus Torvalds60ab26d2005-09-15 21:43:17[diff] [blame]601 if (save_commit_buffer && !ret) {
Stefan Beller9e5252a2018-11-14 00:12:50[diff] [blame]602 set_commit_buffer(r, item, buffer, size);
Linus Torvalds3ff1fbb2005-05-26 01:27:14[diff] [blame]603 return 0;
604 }
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]605 free(buffer);
606 return ret;
607}
608
Stefan Beller9e5252a2018-11-14 00:12:50[diff] [blame]609int repo_parse_commit_gently(struct repository *r,
610 struct commit *item, int quiet_on_missing)
Derrick Stolee9b19ada2018-06-27 13:24:30[diff] [blame]611{
Stefan Beller9e5252a2018-11-14 00:12:50[diff] [blame]612 return repo_parse_commit_internal(r, item, quiet_on_missing, 1);
Derrick Stolee9b19ada2018-06-27 13:24:30[diff] [blame]613}
614
Jeff King7059dcc2013-10-24 08:52:36[diff] [blame]615void parse_commit_or_die(struct commit *item)
616{
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]617 if (repo_parse_commit(the_repository, item))
Jeff King7059dcc2013-10-24 08:52:36[diff] [blame]618 die("unable to parse commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]619 item ? oid_to_hex(&item->object.oid) : "(null)");
Jeff King7059dcc2013-10-24 08:52:36[diff] [blame]620}
621
Christian Couder11af2aa2010-07-22 13:18:30[diff] [blame]622int find_commit_subject(const char *commit_buffer, const char **subject)
623{
624 const char *eol;
625 const char *p = commit_buffer;
626
627 while (*p && (*p != '\n' || p[1] != '\n'))
628 p++;
629 if (*p) {
Johannes Schindelin4e1b06d2016-06-22 20:20:20[diff] [blame]630 p = skip_blank_lines(p + 2);
Junio C Hamano9c9b03b2017-01-28 02:01:41[diff] [blame]631 eol = strchrnul(p, '\n');
Christian Couder11af2aa2010-07-22 13:18:30[diff] [blame]632 } else
633 eol = p;
634
635 *subject = p;
636
637 return eol - p;
638}
639
Charvi Mendiratta6e0e2882021-03-15 07:54:31[diff] [blame]640size_t commit_subject_length(const char *body)
641{
642 const char *p = body;
643 while (*p) {
644 const char *next = skip_blank_lines(p);
645 if (next != p)
646 break;
647 p = strchrnul(p, '\n');
648 if (*p)
649 p++;
650 }
651 return p - body;
652}
653
Linus Torvaldsac5155e2005-05-31 01:44:02[diff] [blame]654struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]655{
Christopher Li812666c2005-04-26 19:00:58[diff] [blame]656 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]657 new_list->item = item;
658 new_list->next = *list_p;
659 *list_p = new_list;
Linus Torvaldsac5155e2005-05-31 01:44:02[diff] [blame]660 return new_list;
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]661}
662
Derrick Stolee597b2c32020-12-08 22:04:13[diff] [blame]663int commit_list_contains(struct commit *item, struct commit_list *list)
664{
665 while (list) {
666 if (list->item == item)
667 return 1;
668 list = list->next;
669 }
670
671 return 0;
672}
673
Miklos Vajna65319472008-06-27 16:21:55[diff] [blame]674unsigned commit_list_count(const struct commit_list *l)
675{
676 unsigned c = 0;
677 for (; l; l = l->next )
678 c++;
679 return c;
680}
681
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]682struct commit_list *copy_commit_list(struct commit_list *list)
683{
684 struct commit_list *head = NULL;
685 struct commit_list **pp = &head;
686 while (list) {
René Scharfecb979db2014-07-10 09:47:47[diff] [blame]687 pp = commit_list_append(list->item, pp);
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]688 list = list->next;
689 }
690 return head;
691}
692
Elijah Newrenb0ca1202020-12-16 22:27:59[diff] [blame]693struct commit_list *reverse_commit_list(struct commit_list *list)
694{
695 struct commit_list *next = NULL, *current, *backup;
696 for (current = list; current; current = backup) {
697 backup = current->next;
698 current->next = next;
699 next = current;
700 }
701 return next;
702}
703
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]704void free_commit_list(struct commit_list *list)
705{
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]706 while (list)
707 pop_commit(&list);
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]708}
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]709
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]710struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]711{
712 struct commit_list **pp = list;
713 struct commit_list *p;
714 while ((p = *pp) != NULL) {
715 if (p->item->date < item->date) {
716 break;
717 }
718 pp = &p->next;
719 }
Linus Torvaldsf7554942005-07-06 16:31:17[diff] [blame]720 return commit_list_insert(item, pp);
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]721}
722
René Scharfec0fb5772022-07-16 16:59:05[diff] [blame]723static int commit_list_compare_by_date(const struct commit_list *a,
724 const struct commit_list *b)
René Scharfe46905892012-03-31 22:10:39[diff] [blame]725{
René Scharfec0fb5772022-07-16 16:59:05[diff] [blame]726 timestamp_t a_date = a->item->date;
727 timestamp_t b_date = b->item->date;
René Scharfe46905892012-03-31 22:10:39[diff] [blame]728 if (a_date < b_date)
729 return 1;
730 if (a_date > b_date)
731 return -1;
732 return 0;
733}
734
René Scharfec0fb5772022-07-16 16:59:05[diff] [blame]735DEFINE_LIST_SORT(static, commit_list_sort, struct commit_list, next);
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]736
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]737void commit_list_sort_by_date(struct commit_list **list)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]738{
René Scharfec0fb5772022-07-16 16:59:05[diff] [blame]739 commit_list_sort(list, commit_list_compare_by_date);
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]740}
741
Daniel Barkalow58e28af2005-04-24 03:29:22[diff] [blame]742struct commit *pop_most_recent_commit(struct commit_list **list,
743 unsigned int mark)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]744{
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]745 struct commit *ret = pop_commit(list);
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]746 struct commit_list *parents = ret->parents;
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]747
748 while (parents) {
Linus Torvalds4056c092005-04-24 02:21:28[diff] [blame]749 struct commit *commit = parents->item;
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]750 if (!repo_parse_commit(the_repository, commit) && !(commit->object.flags & mark)) {
Daniel Barkalow58e28af2005-04-24 03:29:22[diff] [blame]751 commit->object.flags |= mark;
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]752 commit_list_insert_by_date(commit, list);
Linus Torvalds4056c092005-04-24 02:21:28[diff] [blame]753 }
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]754 parents = parents->next;
755 }
756 return ret;
757}
Linus Torvaldse3bc7a32005-06-01 15:34:23[diff] [blame]758
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]759static void clear_commit_marks_1(struct commit_list **plist,
760 struct commit *commit, unsigned int mark)
Junio C Hamanof8f9c732006-01-08 02:52:42[diff] [blame]761{
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]762 while (commit) {
763 struct commit_list *parents;
Junio C Hamanof8f9c732006-01-08 02:52:42[diff] [blame]764
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]765 if (!(mark & commit->object.flags))
766 return;
Junio C Hamano58ecf5c2006-07-05 00:45:22[diff] [blame]767
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]768 commit->object.flags &= ~mark;
769
770 parents = commit->parents;
771 if (!parents)
772 return;
773
René Scharfe4cb39fc2022-12-13 06:27:10[diff] [blame]774 while ((parents = parents->next)) {
775 if (parents->item->object.flags & mark)
776 commit_list_insert(parents->item, plist);
777 }
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]778
779 commit = commit->parents->item;
Junio C Hamanof8f9c732006-01-08 02:52:42[diff] [blame]780 }
781}
782
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]783void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]784{
785 struct commit_list *list = NULL;
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]786
787 while (nr--) {
René Scharfe07f7d552017-12-25 17:43:37[diff] [blame]788 clear_commit_marks_1(&list, *commit, mark);
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]789 commit++;
790 }
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]791 while (list)
792 clear_commit_marks_1(&list, pop_commit(&list), mark);
793}
794
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]795void clear_commit_marks(struct commit *commit, unsigned int mark)
796{
797 clear_commit_marks_many(1, &commit, mark);
798}
799
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40[diff] [blame]800struct commit *pop_commit(struct commit_list **stack)
801{
802 struct commit_list *top = *stack;
803 struct commit *item = top ? top->item : NULL;
804
805 if (top) {
806 *stack = top->next;
807 free(top);
808 }
809 return item;
810}
811
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]812/*
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]813 * Topological sort support
814 */
Junio C Hamano66eb3752013-04-13 06:25:49[diff] [blame]815
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]816/* count number of children that have not been emitted */
817define_commit_slab(indegree_slab, int);
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]818
Derrick Stolee18207032018-08-21 20:54:12[diff] [blame]819define_commit_slab(author_date_slab, timestamp_t);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]820
Derrick Stolee5284fc52018-11-01 13:46:21[diff] [blame]821void record_author_date(struct author_date_slab *author_date,
822 struct commit *commit)
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]823{
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]824 const char *buffer = repo_get_commit_buffer(the_repository, commit,
825 NULL);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]826 struct ident_split ident;
Jeff Kingea5517f2014-08-27 07:56:55[diff] [blame]827 const char *ident_line;
828 size_t ident_len;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]829 char *date_end;
Johannes Schindelindddbad72017-04-26 19:29:31[diff] [blame]830 timestamp_t date;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]831
Jeff Kingea5517f2014-08-27 07:56:55[diff] [blame]832 ident_line = find_commit_header(buffer, "author", &ident_len);
833 if (!ident_line)
834 goto fail_exit; /* no author line */
835 if (split_ident_line(&ident, ident_line, ident_len) ||
836 !ident.date_begin || !ident.date_end)
837 goto fail_exit; /* malformed "author" line */
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]838
Johannes Schindelin1aeb7e72017-04-21 10:45:44[diff] [blame]839 date = parse_timestamp(ident.date_begin, &date_end, 10);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]840 if (date_end != ident.date_end)
841 goto fail_exit; /* malformed date */
842 *(author_date_slab_at(author_date, commit)) = date;
843
844fail_exit:
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]845 repo_unuse_commit_buffer(the_repository, commit, buffer);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]846}
847
Derrick Stolee5284fc52018-11-01 13:46:21[diff] [blame]848int compare_commits_by_author_date(const void *a_, const void *b_,
849 void *cb_data)
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]850{
851 const struct commit *a = a_, *b = b_;
852 struct author_date_slab *author_date = cb_data;
Johannes Schindelindddbad72017-04-26 19:29:31[diff] [blame]853 timestamp_t a_date = *(author_date_slab_at(author_date, a));
854 timestamp_t b_date = *(author_date_slab_at(author_date, b));
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]855
856 /* newer commits with larger date first */
857 if (a_date < b_date)
858 return 1;
859 else if (a_date > b_date)
860 return -1;
861 return 0;
862}
863
Jeff King17587122023-02-24 06:39:27[diff] [blame]864int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_,
865 void *unused UNUSED)
Derrick Stolee3afc6792018-05-01 12:47:11[diff] [blame]866{
867 const struct commit *a = a_, *b = b_;
Abhishek Kumard7f92782021-01-16 18:11:13[diff] [blame]868 const timestamp_t generation_a = commit_graph_generation(a),
869 generation_b = commit_graph_generation(b);
Derrick Stolee3afc6792018-05-01 12:47:11[diff] [blame]870
871 /* newer commits first */
Abhishek Kumarc752ad02020-06-17 09:14:11[diff] [blame]872 if (generation_a < generation_b)
Derrick Stolee3afc6792018-05-01 12:47:11[diff] [blame]873 return 1;
Abhishek Kumarc752ad02020-06-17 09:14:11[diff] [blame]874 else if (generation_a > generation_b)
Derrick Stolee3afc6792018-05-01 12:47:11[diff] [blame]875 return -1;
876
877 /* use date as a heuristic when generations are equal */
878 if (a->date < b->date)
879 return 1;
880 else if (a->date > b->date)
881 return -1;
882 return 0;
883}
884
Jeff King17587122023-02-24 06:39:27[diff] [blame]885int compare_commits_by_commit_date(const void *a_, const void *b_,
886 void *unused UNUSED)
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]887{
888 const struct commit *a = a_, *b = b_;
889 /* newer commits with larger date first */
890 if (a->date < b->date)
891 return 1;
892 else if (a->date > b->date)
893 return -1;
894 return 0;
895}
896
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]897/*
898 * Performs an in-place topological sort on the list supplied.
899 */
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]900void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]901{
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]902 struct commit_list *next, *orig = *list;
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]903 struct commit_list **pptr;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]904 struct indegree_slab indegree;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]905 struct prio_queue queue;
906 struct commit *commit;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]907 struct author_date_slab author_date;
Fredrik Kuivinen6b6dcfc2006-03-10 09:21:37[diff] [blame]908
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]909 if (!orig)
Eric Wong7d6fb372005-12-24 12:12:43[diff] [blame]910 return;
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]911 *list = NULL;
912
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]913 init_indegree_slab(&indegree);
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]914 memset(&queue, '\0', sizeof(queue));
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]915
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]916 switch (sort_order) {
917 default: /* REV_SORT_IN_GRAPH_ORDER */
918 queue.compare = NULL;
919 break;
920 case REV_SORT_BY_COMMIT_DATE:
921 queue.compare = compare_commits_by_commit_date;
922 break;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]923 case REV_SORT_BY_AUTHOR_DATE:
924 init_author_date_slab(&author_date);
925 queue.compare = compare_commits_by_author_date;
926 queue.cb_data = &author_date;
927 break;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]928 }
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]929
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]930 /* Mark them and clear the indegree */
931 for (next = orig; next; next = next->next) {
932 struct commit *commit = next->item;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]933 *(indegree_slab_at(&indegree, commit)) = 1;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]934 /* also record the author dates, if needed */
935 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
936 record_author_date(&author_date, commit);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]937 }
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]938
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]939 /* update the indegree */
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]940 for (next = orig; next; next = next->next) {
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]941 struct commit_list *parents = next->item->parents;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]942 while (parents) {
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]943 struct commit *parent = parents->item;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]944 int *pi = indegree_slab_at(&indegree, parent);
Fredrik Kuivinen6b6dcfc2006-03-10 09:21:37[diff] [blame]945
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]946 if (*pi)
947 (*pi)++;
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]948 parents = parents->next;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]949 }
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]950 }
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]951
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]952 /*
Pierre Habouzit674d1722007-09-10 10:35:06[diff] [blame]953 * find the tips
954 *
955 * tips are nodes not reachable from any other node in the list
956 *
957 * the tips serve as a starting set for the work queue.
958 */
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]959 for (next = orig; next; next = next->next) {
960 struct commit *commit = next->item;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]961
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]962 if (*(indegree_slab_at(&indegree, commit)) == 1)
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]963 prio_queue_put(&queue, commit);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]964 }
Junio C Hamano4c8725f2006-02-16 06:05:33[diff] [blame]965
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]966 /*
967 * This is unfortunate; the initial tips need to be shown
968 * in the order given from the revision traversal machinery.
969 */
970 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
971 prio_queue_reverse(&queue);
972
973 /* We no longer need the commit list */
974 free_commit_list(orig);
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]975
976 pptr = list;
977 *list = NULL;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]978 while ((commit = prio_queue_get(&queue)) != NULL) {
979 struct commit_list *parents;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]980
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]981 for (parents = commit->parents; parents ; parents = parents->next) {
Junio C Hamanocd2b8ae2011-08-25 21:46:52[diff] [blame]982 struct commit *parent = parents->item;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]983 int *pi = indegree_slab_at(&indegree, parent);
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]984
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]985 if (!*pi)
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]986 continue;
987
988 /*
989 * parents are only enqueued for emission
990 * when all their children have been emitted thereby
991 * guaranteeing topological order.
992 */
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]993 if (--(*pi) == 1)
994 prio_queue_put(&queue, parent);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]995 }
996 /*
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]997 * all children of commit have already been
998 * emitted. we can emit it now.
Pierre Habouzit674d1722007-09-10 10:35:06[diff] [blame]999 */
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]1000 *(indegree_slab_at(&indegree, commit)) = 0;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]1001
1002 pptr = &commit_list_insert(commit, pptr)->next;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]1003 }
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]1004
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]1005 clear_indegree_slab(&indegree);
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]1006 clear_prio_queue(&queue);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]1007 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
1008 clear_author_date_slab(&author_date);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]1009}
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]1010
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1011struct rev_collect {
1012 struct commit **commit;
1013 int nr;
1014 int alloc;
1015 unsigned int initial : 1;
1016};
1017
1018static void add_one_commit(struct object_id *oid, struct rev_collect *revs)
1019{
1020 struct commit *commit;
1021
1022 if (is_null_oid(oid))
1023 return;
1024
1025 commit = lookup_commit(the_repository, oid);
1026 if (!commit ||
1027 (commit->object.flags & TMP_MARK) ||
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]1028 repo_parse_commit(the_repository, commit))
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1029 return;
1030
1031 ALLOC_GROW(revs->commit, revs->nr + 1, revs->alloc);
1032 revs->commit[revs->nr++] = commit;
1033 commit->object.flags |= TMP_MARK;
1034}
1035
1036static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
Ævar Arnfjörð Bjarmason5cf88fd2022-08-25 17:09:48[diff] [blame]1037 const char *ident UNUSED,
1038 timestamp_t timestamp UNUSED, int tz UNUSED,
1039 const char *message UNUSED, void *cbdata)
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1040{
1041 struct rev_collect *revs = cbdata;
1042
1043 if (revs->initial) {
1044 revs->initial = 0;
1045 add_one_commit(ooid, revs);
1046 }
1047 add_one_commit(noid, revs);
1048 return 0;
1049}
1050
1051struct commit *get_fork_point(const char *refname, struct commit *commit)
1052{
1053 struct object_id oid;
1054 struct rev_collect revs;
1055 struct commit_list *bases;
1056 int i;
1057 struct commit *ret = NULL;
Junio C Hamanof08132f2019-12-09 18:51:47[diff] [blame]1058 char *full_refname;
1059
Ævar Arnfjörð Bjarmason12cb1c12023-03-28 13:58:54[diff] [blame]1060 switch (repo_dwim_ref(the_repository, refname, strlen(refname), &oid,
1061 &full_refname, 0)) {
Junio C Hamanof08132f2019-12-09 18:51:47[diff] [blame]1062 case 0:
1063 die("No such ref: '%s'", refname);
1064 case 1:
1065 break; /* good */
1066 default:
1067 die("Ambiguous refname: '%s'", refname);
1068 }
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1069
1070 memset(&revs, 0, sizeof(revs));
1071 revs.initial = 1;
Junio C Hamanof08132f2019-12-09 18:51:47[diff] [blame]1072 for_each_reflog_ent(full_refname, collect_one_reflog_ent, &revs);
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1073
Junio C Hamanof08132f2019-12-09 18:51:47[diff] [blame]1074 if (!revs.nr)
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1075 add_one_commit(&oid, &revs);
1076
1077 for (i = 0; i < revs.nr; i++)
1078 revs.commit[i]->object.flags &= ~TMP_MARK;
1079
Ævar Arnfjörð Bjarmasoncb338c22023-03-28 13:58:47[diff] [blame]1080 bases = repo_get_merge_bases_many(the_repository, commit, revs.nr,
1081 revs.commit);
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1082
1083 /*
1084 * There should be one and only one merge base, when we found
1085 * a common ancestor among reflog entries.
1086 */
1087 if (!bases || bases->next)
1088 goto cleanup_return;
1089
1090 /* And the found one must be one of the reflog entries */
1091 for (i = 0; i < revs.nr; i++)
1092 if (&bases->item->object == &revs.commit[i]->object)
1093 break; /* found */
1094 if (revs.nr <= i)
1095 goto cleanup_return;
1096
1097 ret = bases->item;
1098
1099cleanup_return:
Ævar Arnfjörð Bjarmason0c10ed12023-02-06 19:08:13[diff] [blame]1100 free(revs.commit);
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1101 free_commit_list(bases);
Junio C Hamanof08132f2019-12-09 18:51:47[diff] [blame]1102 free(full_refname);
Pratik Karki103148a2018-09-04 22:00:08[diff] [blame]1103 return ret;
1104}
1105
brian m. carlson42d4e1d2020-02-22 20:17:42[diff] [blame]1106/*
1107 * Indexed by hash algorithm identifier.
1108 */
1109static const char *gpg_sig_headers[] = {
1110 NULL,
1111 "gpgsig",
1112 "gpgsig-sha256",
1113};
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1114
brian m. carlson937032e2021-02-11 02:08:04[diff] [blame]1115int sign_with_header(struct strbuf *buf, const char *keyid)
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1116{
1117 struct strbuf sig = STRBUF_INIT;
1118 int inspos, copypos;
Johannes Schindelin3324dd82016-06-29 14:14:54[diff] [blame]1119 const char *eoh;
brian m. carlson42d4e1d2020-02-22 20:17:42[diff] [blame]1120 const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)];
1121 int gpg_sig_header_len = strlen(gpg_sig_header);
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1122
1123 /* find the end of the header */
Johannes Schindelin3324dd82016-06-29 14:14:54[diff] [blame]1124 eoh = strstr(buf->buf, "\n\n");
1125 if (!eoh)
1126 inspos = buf->len;
1127 else
1128 inspos = eoh - buf->buf + 1;
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1129
1130 if (!keyid || !*keyid)
1131 keyid = get_signing_key();
1132 if (sign_buffer(buf, &sig, keyid)) {
1133 strbuf_release(&sig);
1134 return -1;
1135 }
1136
1137 for (copypos = 0; sig.buf[copypos]; ) {
1138 const char *bol = sig.buf + copypos;
1139 const char *eol = strchrnul(bol, '\n');
1140 int len = (eol - bol) + !!*eol;
1141
1142 if (!copypos) {
1143 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1144 inspos += gpg_sig_header_len;
1145 }
René Scharfea91cc7f2020-02-09 13:44:23[diff] [blame]1146 strbuf_insertstr(buf, inspos++, " ");
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1147 strbuf_insert(buf, inspos, bol, len);
1148 inspos += len;
1149 copypos += len;
1150 }
1151 strbuf_release(&sig);
1152 return 0;
1153}
1154
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1155
brian m. carlson937032e2021-02-11 02:08:04[diff] [blame]1156
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1157int parse_signed_commit(const struct commit *commit,
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1158 struct strbuf *payload, struct strbuf *signature,
1159 const struct git_hash_algo *algop)
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1160{
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1161 unsigned long size;
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]1162 const char *buffer = repo_get_commit_buffer(the_repository, commit,
1163 &size);
brian m. carlson937032e2021-02-11 02:08:04[diff] [blame]1164 int ret = parse_buffer_signed_by_header(buffer, size, payload, signature, algop);
1165
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]1166 repo_unuse_commit_buffer(the_repository, commit, buffer);
brian m. carlson937032e2021-02-11 02:08:04[diff] [blame]1167 return ret;
1168}
1169
1170int parse_buffer_signed_by_header(const char *buffer,
1171 unsigned long size,
1172 struct strbuf *payload,
1173 struct strbuf *signature,
1174 const struct git_hash_algo *algop)
1175{
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1176 int in_signature = 0, saw_signature = 0, other_signature = 0;
1177 const char *line, *tail, *p;
1178 const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(algop)];
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1179
1180 line = buffer;
1181 tail = buffer + size;
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1182 while (line < tail) {
1183 const char *sig = NULL;
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1184 const char *next = memchr(line, '\n', tail - line);
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1185
1186 next = next ? next + 1 : tail;
1187 if (in_signature && line[0] == ' ')
1188 sig = line + 1;
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1189 else if (skip_prefix(line, gpg_sig_header, &p) &&
1190 *p == ' ') {
1191 sig = line + strlen(gpg_sig_header) + 1;
1192 other_signature = 0;
1193 }
1194 else if (starts_with(line, "gpgsig"))
1195 other_signature = 1;
1196 else if (other_signature && line[0] != ' ')
1197 other_signature = 0;
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1198 if (sig) {
1199 strbuf_add(signature, sig, next - sig);
1200 saw_signature = 1;
1201 in_signature = 1;
1202 } else {
1203 if (*line == '\n')
1204 /* dump the whole remainder of the buffer */
1205 next = tail;
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1206 if (!other_signature)
1207 strbuf_add(payload, line, next - line);
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1208 in_signature = 0;
1209 }
1210 line = next;
1211 }
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1212 return saw_signature;
1213}
1214
Christian Couder0b05ab62014-07-19 15:01:12[diff] [blame]1215int remove_signature(struct strbuf *buf)
1216{
1217 const char *line = buf->buf;
1218 const char *tail = buf->buf + buf->len;
1219 int in_signature = 0;
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1220 struct sigbuf {
1221 const char *start;
1222 const char *end;
1223 } sigs[2], *sigp = &sigs[0];
1224 int i;
1225 const char *orig_buf = buf->buf;
1226
1227 memset(sigs, 0, sizeof(sigs));
Christian Couder0b05ab62014-07-19 15:01:12[diff] [blame]1228
1229 while (line < tail) {
1230 const char *next = memchr(line, '\n', tail - line);
1231 next = next ? next + 1 : tail;
1232
1233 if (in_signature && line[0] == ' ')
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1234 sigp->end = next;
brian m. carlson42d4e1d2020-02-22 20:17:42[diff] [blame]1235 else if (starts_with(line, "gpgsig")) {
1236 int i;
1237 for (i = 1; i < GIT_HASH_NALGOS; i++) {
1238 const char *p;
1239 if (skip_prefix(line, gpg_sig_headers[i], &p) &&
1240 *p == ' ') {
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1241 sigp->start = line;
1242 sigp->end = next;
brian m. carlson42d4e1d2020-02-22 20:17:42[diff] [blame]1243 in_signature = 1;
1244 }
1245 }
Christian Couder0b05ab62014-07-19 15:01:12[diff] [blame]1246 } else {
1247 if (*line == '\n')
1248 /* dump the whole remainder of the buffer */
1249 next = tail;
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1250 if (in_signature && sigp - sigs != ARRAY_SIZE(sigs))
1251 sigp++;
Christian Couder0b05ab62014-07-19 15:01:12[diff] [blame]1252 in_signature = 0;
1253 }
1254 line = next;
1255 }
1256
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1257 for (i = ARRAY_SIZE(sigs) - 1; i >= 0; i--)
1258 if (sigs[i].start)
1259 strbuf_remove(buf, sigs[i].start - orig_buf, sigs[i].end - sigs[i].start);
Christian Couder0b05ab62014-07-19 15:01:12[diff] [blame]1260
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1261 return sigs[0].start != NULL;
Christian Couder0b05ab62014-07-19 15:01:12[diff] [blame]1262}
1263
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1264static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1265{
1266 struct merge_remote_desc *desc;
1267 struct commit_extra_header *mergetag;
1268 char *buf;
brian m. carlson482c1192021-02-11 02:08:03[diff] [blame]1269 unsigned long size;
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1270 enum object_type type;
brian m. carlson482c1192021-02-11 02:08:03[diff] [blame]1271 struct strbuf payload = STRBUF_INIT;
1272 struct strbuf signature = STRBUF_INIT;
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1273
1274 desc = merge_remote_util(parent);
1275 if (!desc || !desc->obj)
1276 return;
Ævar Arnfjörð Bjarmasonbc726bd2023-03-28 13:58:50[diff] [blame]1277 buf = repo_read_object_file(the_repository, &desc->obj->oid, &type,
1278 &size);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1279 if (!buf || type != OBJ_TAG)
1280 goto free_return;
brian m. carlson482c1192021-02-11 02:08:03[diff] [blame]1281 if (!parse_signature(buf, size, &payload, &signature))
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1282 goto free_return;
1283 /*
1284 * We could verify this signature and either omit the tag when
1285 * it does not validate, but the integrator may not have the
Felipe Contreras0e20b222021-06-15 14:11:10[diff] [blame]1286 * public key of the signer of the tag being merged, while a
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1287 * later auditor may have it while auditing, so let's not run
1288 * verify-signed-buffer here for now...
1289 *
1290 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1291 * warn("warning: signed tag unverified.");
1292 */
René Scharfeca56dad2021-03-13 16:17:22[diff] [blame]1293 CALLOC_ARRAY(mergetag, 1);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1294 mergetag->key = xstrdup("mergetag");
1295 mergetag->value = buf;
1296 mergetag->len = size;
1297
1298 **tail = mergetag;
1299 *tail = &mergetag->next;
brian m. carlson482c1192021-02-11 02:08:03[diff] [blame]1300 strbuf_release(&payload);
1301 strbuf_release(&signature);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1302 return;
1303
1304free_return:
1305 free(buf);
1306}
1307
brian m. carlson434060e2015-06-21 23:14:40[diff] [blame]1308int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
Sebastian G��tteffb6d7d2013-03-31 16:00:14[diff] [blame]1309{
1310 struct strbuf payload = STRBUF_INIT;
1311 struct strbuf signature = STRBUF_INIT;
brian m. carlson434060e2015-06-21 23:14:40[diff] [blame]1312 int ret = 1;
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1313
1314 sigc->result = 'N';
1315
brian m. carlson1fb5cf02021-01-18 23:49:11[diff] [blame]1316 if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1317 goto out;
Fabian Stelzer02769432021-12-09 08:52:43[diff] [blame]1318
Fabian Stelzer6393c952021-12-09 08:52:45[diff] [blame]1319 sigc->payload_type = SIGNATURE_PAYLOAD_COMMIT;
Fabian Stelzer02769432021-12-09 08:52:43[diff] [blame]1320 sigc->payload = strbuf_detach(&payload, &sigc->payload_len);
1321 ret = check_signature(sigc, signature.buf, signature.len);
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1322
1323 out:
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1324 strbuf_release(&payload);
1325 strbuf_release(&signature);
brian m. carlson434060e2015-06-21 23:14:40[diff] [blame]1326
1327 return ret;
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1328}
1329
Hans Jerry Illikainen54887b42019-12-27 13:55:57[diff] [blame]1330void verify_merge_signature(struct commit *commit, int verbosity,
1331 int check_trust)
Jeff Kingedc4d472018-11-06 07:50:17[diff] [blame]1332{
1333 char hex[GIT_MAX_HEXSZ + 1];
1334 struct signature_check signature_check;
Hans Jerry Illikainen54887b42019-12-27 13:55:57[diff] [blame]1335 int ret;
Jeff Kingedc4d472018-11-06 07:50:17[diff] [blame]1336 memset(&signature_check, 0, sizeof(signature_check));
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1337
Hans Jerry Illikainen54887b42019-12-27 13:55:57[diff] [blame]1338 ret = check_commit_signature(commit, &signature_check);
Jeff Kingedc4d472018-11-06 07:50:17[diff] [blame]1339
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 13:58:46[diff] [blame]1340 repo_find_unique_abbrev_r(the_repository, hex, &commit->object.oid,
1341 DEFAULT_ABBREV);
Jeff Kingedc4d472018-11-06 07:50:17[diff] [blame]1342 switch (signature_check.result) {
1343 case 'G':
Hans Jerry Illikainen54887b42019-12-27 13:55:57[diff] [blame]1344 if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL))
1345 die(_("Commit %s has an untrusted GPG signature, "
1346 "allegedly by %s."), hex, signature_check.signer);
Jeff Kingedc4d472018-11-06 07:50:17[diff] [blame]1347 break;
Jeff Kingedc4d472018-11-06 07:50:17[diff] [blame]1348 case 'B':
1349 die(_("Commit %s has a bad GPG signature "
1350 "allegedly by %s."), hex, signature_check.signer);
1351 default: /* 'N' */
1352 die(_("Commit %s does not have a GPG signature."), hex);
1353 }
1354 if (verbosity >= 0 && signature_check.result == 'G')
1355 printf(_("Commit %s has a good GPG signature by %s\n"),
1356 hex, signature_check.signer);
1357
1358 signature_check_clear(&signature_check);
1359}
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1360
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1361void append_merge_tag_headers(struct commit_list *parents,
1362 struct commit_extra_header ***tail)
1363{
1364 while (parents) {
1365 struct commit *parent = parents->item;
1366 handle_signed_tag(parent, tail);
1367 parents = parents->next;
1368 }
1369}
1370
1371static void add_extra_header(struct strbuf *buffer,
1372 struct commit_extra_header *extra)
1373{
1374 strbuf_addstr(buffer, extra->key);
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1375 if (extra->len)
1376 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1377 else
1378 strbuf_addch(buffer, '\n');
1379}
1380
Junio C Hamanoc871a1d2012-01-05 18:54:14[diff] [blame]1381struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1382 const char **exclude)
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1383{
1384 struct commit_extra_header *extra = NULL;
1385 unsigned long size;
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]1386 const char *buffer = repo_get_commit_buffer(the_repository, commit,
1387 &size);
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1388 extra = read_commit_extra_header_lines(buffer, size, exclude);
Ævar Arnfjörð Bjarmasonecb50912023-03-28 13:58:48[diff] [blame]1389 repo_unuse_commit_buffer(the_repository, commit, buffer);
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1390 return extra;
1391}
1392
Johannes Schindelinfef461e2018-04-25 09:54:04[diff] [blame]1393int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
Christian Couder063da622014-07-07 06:35:37[diff] [blame]1394{
1395 struct commit_extra_header *extra, *to_free;
Johannes Schindelinfef461e2018-04-25 09:54:04[diff] [blame]1396 int res = 0;
Christian Couder063da622014-07-07 06:35:37[diff] [blame]1397
1398 to_free = read_commit_extra_headers(commit, NULL);
Johannes Schindelinfef461e2018-04-25 09:54:04[diff] [blame]1399 for (extra = to_free; !res && extra; extra = extra->next) {
Christian Couder063da622014-07-07 06:35:37[diff] [blame]1400 if (strcmp(extra->key, "mergetag"))
1401 continue; /* not a merge tag */
Johannes Schindelinfef461e2018-04-25 09:54:04[diff] [blame]1402 res = fn(commit, extra, data);
Christian Couder063da622014-07-07 06:35:37[diff] [blame]1403 }
1404 free_commit_extra_headers(to_free);
Johannes Schindelinfef461e2018-04-25 09:54:04[diff] [blame]1405 return res;
Christian Couder063da622014-07-07 06:35:37[diff] [blame]1406}
1407
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1408static inline int standard_header_field(const char *field, size_t len)
1409{
René Scharfeb0725042017-02-25 19:27:40[diff] [blame]1410 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1411 (len == 6 && !memcmp(field, "parent", 6)) ||
1412 (len == 6 && !memcmp(field, "author", 6)) ||
1413 (len == 9 && !memcmp(field, "committer", 9)) ||
1414 (len == 8 && !memcmp(field, "encoding", 8)));
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1415}
1416
Junio C Hamanoc871a1d2012-01-05 18:54:14[diff] [blame]1417static int excluded_header_field(const char *field, size_t len, const char **exclude)
1418{
1419 if (!exclude)
1420 return 0;
1421
1422 while (*exclude) {
1423 size_t xlen = strlen(*exclude);
René Scharfeb0725042017-02-25 19:27:40[diff] [blame]1424 if (len == xlen && !memcmp(field, *exclude, xlen))
Junio C Hamanoc871a1d2012-01-05 18:54:14[diff] [blame]1425 return 1;
1426 exclude++;
1427 }
1428 return 0;
1429}
1430
Junio C Hamano82a75292012-09-15 20:58:15[diff] [blame]1431static struct commit_extra_header *read_commit_extra_header_lines(
1432 const char *buffer, size_t size,
1433 const char **exclude)
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1434{
1435 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1436 const char *line, *next, *eof, *eob;
1437 struct strbuf buf = STRBUF_INIT;
1438
1439 for (line = buffer, eob = line + size;
1440 line < eob && *line != '\n';
1441 line = next) {
1442 next = memchr(line, '\n', eob - line);
1443 next = next ? next + 1 : eob;
1444 if (*line == ' ') {
1445 /* continuation */
1446 if (it)
1447 strbuf_add(&buf, line + 1, next - (line + 1));
1448 continue;
1449 }
1450 if (it)
1451 it->value = strbuf_detach(&buf, &it->len);
1452 strbuf_reset(&buf);
1453 it = NULL;
1454
René Scharfe50a01cc2017-02-25 19:21:52[diff] [blame]1455 eof = memchr(line, ' ', next - line);
1456 if (!eof)
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1457 eof = next;
René Scharfeb0725042017-02-25 19:27:40[diff] [blame]1458 else if (standard_header_field(line, eof - line) ||
1459 excluded_header_field(line, eof - line, exclude))
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1460 continue;
1461
René Scharfeca56dad2021-03-13 16:17:22[diff] [blame]1462 CALLOC_ARRAY(it, 1);
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1463 it->key = xmemdupz(line, eof-line);
1464 *tail = it;
1465 tail = &it->next;
1466 if (eof + 1 < next)
1467 strbuf_add(&buf, eof + 1, next - (eof + 1));
1468 }
1469 if (it)
1470 it->value = strbuf_detach(&buf, &it->len);
1471 return extra;
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1472}
1473
1474void free_commit_extra_headers(struct commit_extra_header *extra)
1475{
1476 while (extra) {
1477 struct commit_extra_header *next = extra->next;
1478 free(extra->key);
1479 free(extra->value);
1480 free(extra);
1481 extra = next;
1482 }
1483}
1484
Patryk Obara5078f342018-01-28 00:13:16[diff] [blame]1485int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
1486 struct commit_list *parents, struct object_id *ret,
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1487 const char *author, const char *sign_commit)
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1488{
1489 struct commit_extra_header *extra = NULL, **tail = &extra;
1490 int result;
1491
1492 append_merge_tag_headers(parents, &tail);
Phillip Woode8cbe212020-08-17 17:40:01[diff] [blame]1493 result = commit_tree_extended(msg, msg_len, tree, parents, ret, author,
1494 NULL, sign_commit, extra);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1495 free_commit_extra_headers(extra);
1496 return result;
1497}
1498
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1499static int find_invalid_utf8(const char *buf, int len)
1500{
1501 int offset = 0;
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1502 static const unsigned int max_codepoint[] = {
1503 0x7f, 0x7ff, 0xffff, 0x10ffff
1504 };
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1505
1506 while (len) {
1507 unsigned char c = *buf++;
1508 int bytes, bad_offset;
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1509 unsigned int codepoint;
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1510 unsigned int min_val, max_val;
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1511
1512 len--;
1513 offset++;
1514
1515 /* Simple US-ASCII? No worries. */
1516 if (c < 0x80)
1517 continue;
1518
1519 bad_offset = offset-1;
1520
1521 /*
1522 * Count how many more high bits set: that's how
1523 * many more bytes this sequence should have.
1524 */
1525 bytes = 0;
1526 while (c & 0x40) {
1527 c <<= 1;
1528 bytes++;
1529 }
1530
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1531 /*
1532 * Must be between 1 and 3 more bytes. Longer sequences result in
1533 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1534 */
1535 if (bytes < 1 || 3 < bytes)
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1536 return bad_offset;
1537
1538 /* Do we *have* that many bytes? */
1539 if (len < bytes)
1540 return bad_offset;
1541
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1542 /*
1543 * Place the encoded bits at the bottom of the value and compute the
1544 * valid range.
1545 */
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1546 codepoint = (c & 0x7f) >> bytes;
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1547 min_val = max_codepoint[bytes-1] + 1;
1548 max_val = max_codepoint[bytes];
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1549
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1550 offset += bytes;
1551 len -= bytes;
1552
1553 /* And verify that they are good continuation bytes */
1554 do {
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1555 codepoint <<= 6;
1556 codepoint |= *buf & 0x3f;
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1557 if ((*buf++ & 0xc0) != 0x80)
1558 return bad_offset;
1559 } while (--bytes);
1560
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1561 /* Reject codepoints that are out of range for the sequence length. */
1562 if (codepoint < min_val || codepoint > max_val)
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1563 return bad_offset;
1564 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1565 if ((codepoint & 0x1ff800) == 0xd800)
1566 return bad_offset;
Peter Krefting81050ac2013-07-09 11:16:33[diff] [blame]1567 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
Junio C Hamanodc773a62013-08-05 16:52:28[diff] [blame]1568 if ((codepoint & 0xfffe) == 0xfffe)
Peter Krefting81050ac2013-07-09 11:16:33[diff] [blame]1569 return bad_offset;
1570 /* So are anything in the range U+FDD0..U+FDEF. */
1571 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1572 return bad_offset;
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1573 }
1574 return -1;
1575}
1576
1577/*
1578 * This verifies that the buffer is in proper utf8 format.
1579 *
1580 * If it isn't, it assumes any non-utf8 characters are Latin1,
1581 * and does the conversion.
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1582 */
1583static int verify_utf8(struct strbuf *buf)
1584{
1585 int ok = 1;
1586 long pos = 0;
1587
1588 for (;;) {
1589 int bad;
1590 unsigned char c;
1591 unsigned char replace[2];
1592
1593 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1594 if (bad < 0)
1595 return ok;
1596 pos += bad;
1597 ok = 0;
1598 c = buf->buf[pos];
1599 strbuf_remove(buf, pos, 1);
1600
1601 /* We know 'c' must be in the range 128-255 */
1602 replace[0] = 0xc0 + (c >> 6);
1603 replace[1] = 0x80 + (c & 0x3f);
1604 strbuf_insert(buf, pos, replace, 2);
1605 pos += 2;
1606 }
1607}
1608
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1609static const char commit_utf8_warn[] =
Vasco Almeida4fa4b312016-09-19 13:08:16[diff] [blame]1610N_("Warning: commit message did not conform to UTF-8.\n"
1611 "You may want to amend it after fixing the message, or set the config\n"
Jiang Xinb4eda052022-06-17 10:03:09[diff] [blame]1612 "variable i18n.commitEncoding to the encoding your project uses.\n");
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1613
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1614int commit_tree_extended(const char *msg, size_t msg_len,
Patryk Obara5078f342018-01-28 00:13:16[diff] [blame]1615 const struct object_id *tree,
1616 struct commit_list *parents, struct object_id *ret,
Phillip Woode8cbe212020-08-17 17:40:01[diff] [blame]1617 const char *author, const char *committer,
1618 const char *sign_commit,
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1619 struct commit_extra_header *extra)
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1620{
1621 int result;
1622 int encoding_is_utf8;
1623 struct strbuf buffer;
1624
brian m. carlsone816caa2018-03-12 02:27:42[diff] [blame]1625 assert_oid_type(tree, OBJ_TREE);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1626
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1627 if (memchr(msg, '\0', msg_len))
Nguyễn Thái Ngọc Duy37576c12011-12-15 13:47:23[diff] [blame]1628 return error("a NUL byte in commit log message not allowed.");
1629
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1630 /* Not having i18n.commitencoding is the same as having utf-8 */
1631 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1632
1633 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
Patryk Obara5078f342018-01-28 00:13:16[diff] [blame]1634 strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree));
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1635
1636 /*
1637 * NOTE! This ordering means that the same exact tree merged with a
1638 * different order of parents will be a _different_ changeset even
1639 * if everything else stays the same.
1640 */
1641 while (parents) {
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]1642 struct commit *parent = pop_commit(&parents);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1643 strbuf_addf(&buffer, "parent %s\n",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1644 oid_to_hex(&parent->object.oid));
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1645 }
1646
1647 /* Person/date information */
1648 if (!author)
Jeff Kingf9bc5732012-05-24 23:28:40[diff] [blame]1649 author = git_author_info(IDENT_STRICT);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1650 strbuf_addf(&buffer, "author %s\n", author);
Phillip Woode8cbe212020-08-17 17:40:01[diff] [blame]1651 if (!committer)
1652 committer = git_committer_info(IDENT_STRICT);
1653 strbuf_addf(&buffer, "committer %s\n", committer);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1654 if (!encoding_is_utf8)
1655 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1656
1657 while (extra) {
1658 add_extra_header(&buffer, extra);
1659 extra = extra->next;
1660 }
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1661 strbuf_addch(&buffer, '\n');
1662
1663 /* And add the comment */
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1664 strbuf_add(&buffer, msg, msg_len);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1665
1666 /* And check the encoding */
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1667 if (encoding_is_utf8 && !verify_utf8(&buffer))
Vasco Almeida4fa4b312016-09-19 13:08:16[diff] [blame]1668 fprintf(stderr, _(commit_utf8_warn));
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1669
brian m. carlson937032e2021-02-11 02:08:04[diff] [blame]1670 if (sign_commit && sign_with_header(&buffer, sign_commit)) {
Rene Scharfee5051462017-08-30 17:49:38[diff] [blame]1671 result = -1;
1672 goto out;
1673 }
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1674
Ævar Arnfjörð Bjarmasonc80d2262022-02-04 23:48:26[diff] [blame]1675 result = write_object_file(buffer.buf, buffer.len, OBJ_COMMIT, ret);
Rene Scharfee5051462017-08-30 17:49:38[diff] [blame]1676out:
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1677 strbuf_release(&buffer);
1678 return result;
1679}
Junio C Hamanoae8e4c92011-11-07 21:26:22[diff] [blame]1680
Nguyễn Thái Ngọc Duye2e5ac22018-05-19 05:28:30[diff] [blame]1681define_commit_slab(merge_desc_slab, struct merge_remote_desc *);
1682static struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab);
1683
1684struct merge_remote_desc *merge_remote_util(struct commit *commit)
1685{
1686 return *merge_desc_slab_at(&merge_desc_slab, commit);
1687}
1688
René Scharfebeb518c2016-08-13 12:11:27[diff] [blame]1689void set_merge_remote_desc(struct commit *commit,
1690 const char *name, struct object *obj)
1691{
1692 struct merge_remote_desc *desc;
René Scharfe5447a762016-08-13 12:21:27[diff] [blame]1693 FLEX_ALLOC_STR(desc, name, name);
René Scharfebeb518c2016-08-13 12:11:27[diff] [blame]1694 desc->obj = obj;
Nguyễn Thái Ngọc Duye2e5ac22018-05-19 05:28:30[diff] [blame]1695 *merge_desc_slab_at(&merge_desc_slab, commit) = desc;
René Scharfebeb518c2016-08-13 12:11:27[diff] [blame]1696}
1697
Junio C Hamanoae8e4c92011-11-07 21:26:22[diff] [blame]1698struct commit *get_merge_parent(const char *name)
1699{
1700 struct object *obj;
1701 struct commit *commit;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]1702 struct object_id oid;
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 13:58:46[diff] [blame]1703 if (repo_get_oid(the_repository, name, &oid))
Junio C Hamanoae8e4c92011-11-07 21:26:22[diff] [blame]1704 return NULL;
Stefan Beller109cd762018-06-29 01:21:51[diff] [blame]1705 obj = parse_object(the_repository, &oid);
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 13:58:46[diff] [blame]1706 commit = (struct commit *)repo_peel_to_type(the_repository, name, 0,
1707 obj, OBJ_COMMIT);
Nguyễn Thái Ngọc Duye2e5ac22018-05-19 05:28:30[diff] [blame]1708 if (commit && !merge_remote_util(commit))
René Scharfebeb518c2016-08-13 12:11:27[diff] [blame]1709 set_merge_remote_desc(commit, name, obj);
Junio C Hamanoae8e4c92011-11-07 21:26:22[diff] [blame]1710 return commit;
1711}
René Scharfe89b5f1d2012-04-25 20:35:27[diff] [blame]1712
1713/*
1714 * Append a commit to the end of the commit_list.
1715 *
1716 * next starts by pointing to the variable that holds the head of an
1717 * empty commit_list, and is updated to point to the "next" field of
1718 * the last item on the list as new commits are appended.
1719 *
1720 * Usage example:
1721 *
1722 * struct commit_list *list;
1723 * struct commit_list **next = &list;
1724 *
1725 * next = commit_list_append(c1, next);
1726 * next = commit_list_append(c2, next);
1727 * assert(commit_list_count(list) == 2);
1728 * return list;
1729 */
1730struct commit_list **commit_list_append(struct commit *commit,
1731 struct commit_list **next)
1732{
Brandon Williams258c03e2018-02-14 18:59:37[diff] [blame]1733 struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
1734 new_commit->item = commit;
1735 *next = new_commit;
1736 new_commit->next = NULL;
1737 return &new_commit->next;
René Scharfe89b5f1d2012-04-25 20:35:27[diff] [blame]1738}
Nguyễn Thái Ngọc Duyefc7df42012-10-26 15:53:51[diff] [blame]1739
John Caicfc5cf42022-01-06 20:07:35[diff] [blame]1740const char *find_header_mem(const char *msg, size_t len,
1741 const char *key, size_t *out_len)
Jeff Kingfe6eb7f2014-08-27 07:56:01[diff] [blame]1742{
1743 int key_len = strlen(key);
1744 const char *line = msg;
1745
John Caicfc5cf42022-01-06 20:07:35[diff] [blame]1746 /*
1747 * NEEDSWORK: It's possible for strchrnul() to scan beyond the range
1748 * given by len. However, current callers are safe because they compute
1749 * len by scanning a NUL-terminated block of memory starting at msg.
1750 * Nonetheless, it would be better to ensure the function does not look
1751 * at msg beyond the len provided by the caller.
1752 */
1753 while (line && line < msg + len) {
Jeff Kingfe6eb7f2014-08-27 07:56:01[diff] [blame]1754 const char *eol = strchrnul(line, '\n');
1755
1756 if (line == eol)
1757 return NULL;
1758
1759 if (eol - line > key_len &&
1760 !strncmp(line, key, key_len) &&
1761 line[key_len] == ' ') {
1762 *out_len = eol - line - key_len - 1;
1763 return line + key_len + 1;
1764 }
1765 line = *eol ? eol + 1 : NULL;
1766 }
1767 return NULL;
1768}
Junio C Hamano0ed8a4e2014-12-22 20:26:23[diff] [blame]1769
John Caicfc5cf42022-01-06 20:07:35[diff] [blame]1770const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1771{
1772 return find_header_mem(msg, strlen(msg), key, out_len);
1773}
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1774/*
Jonathan Tan710714a2016-11-02 17:29:17[diff] [blame]1775 * Inspect the given string and determine the true "end" of the log message, in
Bradley M. Kuhn3abd4a62020-10-20 01:03:55[diff] [blame]1776 * order to find where to put a new Signed-off-by trailer. Ignored are
Brian Malehornd76650b2017-05-16 06:06:49[diff] [blame]1777 * trailing comment lines and blank lines. To support "git commit -s
1778 * --amend" on an existing commit, we also ignore "Conflicts:". To
1779 * support "git commit -v", we truncate at cut lines.
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1780 *
1781 * Returns the number of bytes from the tail to ignore, to be fed as
1782 * the second parameter to append_signoff().
1783 */
Linus Arver7cb26a12023-10-20 19:01:33[diff] [blame]1784size_t ignored_log_message_bytes(const char *buf, size_t len)
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1785{
Jeff King66e83d92018-08-23 00:50:51[diff] [blame]1786 size_t boc = 0;
1787 size_t bol = 0;
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1788 int in_old_conflicts_block = 0;
Brian Malehornd76650b2017-05-16 06:06:49[diff] [blame]1789 size_t cutoff = wt_status_locate_end(buf, len);
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1790
Brian Malehornd76650b2017-05-16 06:06:49[diff] [blame]1791 while (bol < cutoff) {
Jonathan Tan710714a2016-11-02 17:29:17[diff] [blame]1792 const char *next_line = memchr(buf + bol, '\n', len - bol);
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1793
Jonathan Tan710714a2016-11-02 17:29:17[diff] [blame]1794 if (!next_line)
1795 next_line = buf + len;
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1796 else
1797 next_line++;
1798
Jonathan Tan710714a2016-11-02 17:29:17[diff] [blame]1799 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1800 /* is this the first of the run of comments? */
1801 if (!boc)
1802 boc = bol;
1803 /* otherwise, it is just continuing */
Jonathan Tan710714a2016-11-02 17:29:17[diff] [blame]1804 } else if (starts_with(buf + bol, "Conflicts:\n")) {
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1805 in_old_conflicts_block = 1;
1806 if (!boc)
1807 boc = bol;
Jonathan Tan710714a2016-11-02 17:29:17[diff] [blame]1808 } else if (in_old_conflicts_block && buf[bol] == '\t') {
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1809 ; /* a pathname in the conflicts block */
1810 } else if (boc) {
1811 /* the previous was not trailing comment */
1812 boc = 0;
1813 in_old_conflicts_block = 0;
1814 }
Jonathan Tan710714a2016-11-02 17:29:17[diff] [blame]1815 bol = next_line - buf;
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1816 }
Brian Malehornd76650b2017-05-16 06:06:49[diff] [blame]1817 return boc ? len - boc : len - cutoff;
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1818}
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1819
1820int run_commit_hook(int editor_is_used, const char *index_file,
Ævar Arnfjörð Bjarmasona8cc5942022-03-07 12:33:46[diff] [blame]1821 int *invoked_hook, const char *name, ...)
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1822{
Emily Shafferf4432462021-12-22 03:59:40[diff] [blame]1823 struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1824 va_list args;
Emily Shafferf4432462021-12-22 03:59:40[diff] [blame]1825 const char *arg;
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1826
Emily Shafferf4432462021-12-22 03:59:40[diff] [blame]1827 strvec_pushf(&opt.env, "GIT_INDEX_FILE=%s", index_file);
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1828
1829 /*
1830 * Let the hook know that no editor will be launched.
1831 */
1832 if (!editor_is_used)
Emily Shafferf4432462021-12-22 03:59:40[diff] [blame]1833 strvec_push(&opt.env, "GIT_EDITOR=:");
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1834
1835 va_start(args, name);
Emily Shafferf4432462021-12-22 03:59:40[diff] [blame]1836 while ((arg = va_arg(args, const char *)))
1837 strvec_push(&opt.args, arg);
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1838 va_end(args);
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1839
Ævar Arnfjörð Bjarmason4369e3a2022-03-21 23:15:13[diff] [blame]1840 opt.invoked_hook = invoked_hook;
Emily Shafferf4432462021-12-22 03:59:40[diff] [blame]1841 return run_hooks_opt(name, &opt);
Phillip Wood49697cb2019-10-15 10:25:31[diff] [blame]1842}