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