blob: cab8d4455bdbd6e4b87031613300be1112a19df5 [file] [log] [blame]
Junio C Hamano8f1d2e62006-01-07 01:33:54 -08001#include "cache.h"
Linus Torvalds961784e2005-05-18 16:14:22 -07002#include "tag.h"
Daniel Barkalow175785e2005-04-18 11:39:48 -07003#include "commit.h"
Johannes Schindelined09aef2006-10-30 20:09:06 +01004#include "pkt-line.h"
Junio C Hamano52883fb2006-12-25 11:48:35 -08005#include "utf8.h"
Junio C Hamano199c45b2007-04-09 02:34:05 -07006#include "diff.h"
7#include "revision.h"
Johannes Schindelina97a7462009-10-09 12:21:57 +02008#include "notes.h"
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07009#include "gpg-interface.h"
René Scharfe46905892012-04-01 00:10:39 +020010#include "mergesort.h"
Junio C Hamanoa84b7942013-04-13 11:56:41 -070011#include "commit-slab.h"
Junio C Hamanoda24b102013-06-06 21:58:12 -070012#include "prio-queue.h"
Dmitry S. Dolzhenko0a9136f2014-02-26 22:49:22 +040013#include "sha1-lookup.h"
Brian Malehornd76650b2017-05-15 23:06:49 -070014#include "wt-status.h"
Daniel Barkalow175785e2005-04-18 11:39:48 -070015
Junio C Hamano82a75292012-09-15 13:58:15 -070016static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
17
Linus Torvalds60ab26d2005-09-15 14:43:17 -070018int save_commit_buffer = 1;
19
Daniel Barkalow175785e2005-04-18 11:39:48 -070020const char *commit_type = "commit";
21
brian m. carlsonbc832662017-05-06 22:10:10 +000022struct commit *lookup_commit_reference_gently(const struct object_id *oid,
Junio C Hamanof76412e2005-08-21 02:51:10 -070023 int quiet)
Linus Torvalds961784e2005-05-18 16:14:22 -070024{
brian m. carlsonc251c832017-05-06 22:10:38 +000025 struct object *obj = deref_tag(parse_object(oid), NULL, 0);
Linus Torvalds961784e2005-05-18 16:14:22 -070026
27 if (!obj)
28 return NULL;
Jeff King8ff226a2014-07-13 02:42:03 -040029 return object_as_type(obj, OBJ_COMMIT, quiet);
Junio C Hamanof76412e2005-08-21 02:51:10 -070030}
31
brian m. carlsonbc832662017-05-06 22:10:10 +000032struct commit *lookup_commit_reference(const struct object_id *oid)
Junio C Hamanof76412e2005-08-21 02:51:10 -070033{
brian m. carlsonbc832662017-05-06 22:10:10 +000034 return lookup_commit_reference_gently(oid, 0);
Linus Torvalds961784e2005-05-18 16:14:22 -070035}
36
brian m. carlsonbc832662017-05-06 22:10:10 +000037struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name)
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100038{
brian m. carlsonbc832662017-05-06 22:10:10 +000039 struct commit *c = lookup_commit_reference(oid);
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100040 if (!c)
41 die(_("could not parse %s"), ref_name);
brian m. carlsonbc832662017-05-06 22:10:10 +000042 if (oidcmp(oid, &c->object.oid)) {
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100043 warning(_("%s %s is not a commit!"),
brian m. carlsonbc832662017-05-06 22:10:10 +000044 ref_name, oid_to_hex(oid));
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100045 }
46 return c;
47}
48
brian m. carlsonbc832662017-05-06 22:10:10 +000049struct commit *lookup_commit(const struct object_id *oid)
Daniel Barkalow175785e2005-04-18 11:39:48 -070050{
brian m. carlsonbc832662017-05-06 22:10:10 +000051 struct object *obj = lookup_object(oid->hash);
Jeff Kingd36f51c2014-07-13 02:41:55 -040052 if (!obj)
brian m. carlsonbc832662017-05-06 22:10:10 +000053 return create_object(oid->hash, alloc_commit_node());
Jeff King8ff226a2014-07-13 02:42:03 -040054 return object_as_type(obj, OBJ_COMMIT, 0);
Daniel Barkalow175785e2005-04-18 11:39:48 -070055}
56
Pat Notza6fa5992010-11-02 13:59:07 -060057struct commit *lookup_commit_reference_by_name(const char *name)
58{
brian m. carlson7683e2e2015-03-13 23:39:34 +000059 struct object_id oid;
Pat Notza6fa5992010-11-02 13:59:07 -060060 struct commit *commit;
61
brian m. carlsone82caf32017-07-13 23:49:28 +000062 if (get_oid_committish(name, &oid))
Pat Notza6fa5992010-11-02 13:59:07 -060063 return NULL;
brian m. carlsonbc832662017-05-06 22:10:10 +000064 commit = lookup_commit_reference(&oid);
Jeff King5e7d4d32013-10-24 04:53:19 -040065 if (parse_commit(commit))
Pat Notza6fa5992010-11-02 13:59:07 -060066 return NULL;
67 return commit;
68}
69
Johannes Schindelindddbad72017-04-26 21:29:31 +020070static timestamp_t parse_commit_date(const char *buf, const char *tail)
Daniel Barkalow175785e2005-04-18 11:39:48 -070071{
Martin Koegler0a617792008-01-19 18:35:23 +010072 const char *dateptr;
Daniel Barkalow175785e2005-04-18 11:39:48 -070073
Martin Koegler0a617792008-01-19 18:35:23 +010074 if (buf + 6 >= tail)
75 return 0;
Daniel Barkalow175785e2005-04-18 11:39:48 -070076 if (memcmp(buf, "author", 6))
77 return 0;
Martin Koegler0a617792008-01-19 18:35:23 +010078 while (buf < tail && *buf++ != '\n')
Daniel Barkalow175785e2005-04-18 11:39:48 -070079 /* nada */;
Martin Koegler0a617792008-01-19 18:35:23 +010080 if (buf + 9 >= tail)
81 return 0;
Daniel Barkalow175785e2005-04-18 11:39:48 -070082 if (memcmp(buf, "committer", 9))
83 return 0;
Martin Koegler0a617792008-01-19 18:35:23 +010084 while (buf < tail && *buf++ != '>')
Daniel Barkalow175785e2005-04-18 11:39:48 -070085 /* nada */;
Martin Koegler0a617792008-01-19 18:35:23 +010086 if (buf >= tail)
87 return 0;
88 dateptr = buf;
89 while (buf < tail && *buf++ != '\n')
90 /* nada */;
91 if (buf >= tail)
92 return 0;
Johannes Schindelin1aeb7e72017-04-21 12:45:44 +020093 /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
94 return parse_timestamp(dateptr, NULL, 10);
Daniel Barkalow175785e2005-04-18 11:39:48 -070095}
96
Junio C Hamano5040f172006-04-06 23:58:51 -070097static struct commit_graft **commit_graft;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -070098static int commit_graft_alloc, commit_graft_nr;
99
Dmitry S. Dolzhenko0a9136f2014-02-26 22:49:22 +0400100static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
101{
102 struct commit_graft **commit_graft_table = table;
brian m. carlson7683e2e2015-03-13 23:39:34 +0000103 return commit_graft_table[index]->oid.hash;
Dmitry S. Dolzhenko0a9136f2014-02-26 22:49:22 +0400104}
105
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700106static int commit_graft_pos(const unsigned char *sha1)
107{
Dmitry S. Dolzhenko0a9136f2014-02-26 22:49:22 +0400108 return sha1_pos(sha1, commit_graft, commit_graft_nr,
109 commit_graft_sha1_access);
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700110}
111
Junio C Hamano5040f172006-04-06 23:58:51 -0700112int register_commit_graft(struct commit_graft *graft, int ignore_dups)
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700113{
brian m. carlson7683e2e2015-03-13 23:39:34 +0000114 int pos = commit_graft_pos(graft->oid.hash);
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700115
Junio C Hamano5040f172006-04-06 23:58:51 -0700116 if (0 <= pos) {
117 if (ignore_dups)
118 free(graft);
119 else {
120 free(commit_graft[pos]);
121 commit_graft[pos] = graft;
122 }
123 return 1;
124 }
125 pos = -pos - 1;
Dmitry S. Dolzhenkod6e82b52014-03-04 02:31:52 +0400126 ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
127 commit_graft_nr++;
Junio C Hamano5040f172006-04-06 23:58:51 -0700128 if (pos < commit_graft_nr)
129 memmove(commit_graft + pos + 1,
130 commit_graft + pos,
131 (commit_graft_nr - pos - 1) *
132 sizeof(*commit_graft));
133 commit_graft[pos] = graft;
134 return 0;
135}
136
Patryk Obara9a934032017-08-18 20:33:12 +0200137struct commit_graft *read_graft_line(struct strbuf *line)
Junio C Hamano5040f172006-04-06 23:58:51 -0700138{
139 /* The format is just "Commit Parent1 Parent2 ...\n" */
Patryk Obaracfa5bf12017-08-18 20:33:14 +0200140 int i, phase;
141 const char *tail = NULL;
Junio C Hamano5040f172006-04-06 23:58:51 -0700142 struct commit_graft *graft = NULL;
Patryk Obaracfa5bf12017-08-18 20:33:14 +0200143 struct object_id dummy_oid, *oid;
Junio C Hamano5040f172006-04-06 23:58:51 -0700144
Patryk Obara9a934032017-08-18 20:33:12 +0200145 strbuf_rtrim(line);
146 if (!line->len || line->buf[0] == '#')
Junio C Hamano5bc4ce52006-04-16 14:24:56 -0700147 return NULL;
Patryk Obaracfa5bf12017-08-18 20:33:14 +0200148 /*
149 * phase 0 verifies line, counts hashes in line and allocates graft
150 * phase 1 fills graft
151 */
152 for (phase = 0; phase < 2; phase++) {
153 oid = graft ? &graft->oid : &dummy_oid;
154 if (parse_oid_hex(line->buf, oid, &tail))
Junio C Hamano5040f172006-04-06 23:58:51 -0700155 goto bad_graft_data;
Patryk Obaracfa5bf12017-08-18 20:33:14 +0200156 for (i = 0; *tail != '\0'; i++) {
157 oid = graft ? &graft->parent[i] : &dummy_oid;
158 if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
159 goto bad_graft_data;
160 }
161 if (!graft) {
162 graft = xmalloc(st_add(sizeof(*graft),
163 st_mult(sizeof(struct object_id), i)));
164 graft->nr_parent = i;
165 }
Junio C Hamano5040f172006-04-06 23:58:51 -0700166 }
167 return graft;
Ralf Thielowdf5d43b2010-12-01 20:15:59 +0100168
169bad_graft_data:
Patryk Obara9a934032017-08-18 20:33:12 +0200170 error("bad graft data: %s", line->buf);
Patryk Obaracfa5bf12017-08-18 20:33:14 +0200171 assert(!graft);
Ralf Thielowdf5d43b2010-12-01 20:15:59 +0100172 return NULL;
Junio C Hamano5040f172006-04-06 23:58:51 -0700173}
174
Nanako Shiraishic5ae6432008-10-02 19:14:30 +0900175static int read_graft_file(const char *graft_file)
Junio C Hamano5040f172006-04-06 23:58:51 -0700176{
Nguyễn Thái Ngọc Duye9d983f2017-05-03 17:16:50 +0700177 FILE *fp = fopen_or_warn(graft_file, "r");
Johannes Schindeline228c172013-12-27 21:49:57 +0100178 struct strbuf buf = STRBUF_INIT;
Junio C Hamano5040f172006-04-06 23:58:51 -0700179 if (!fp)
180 return -1;
Johannes Schindeline228c172013-12-27 21:49:57 +0100181 while (!strbuf_getwholeline(&buf, fp, '\n')) {
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700182 /* The format is just "Commit Parent1 Parent2 ...\n" */
Patryk Obara9a934032017-08-18 20:33:12 +0200183 struct commit_graft *graft = read_graft_line(&buf);
Junio C Hamano5bc4ce52006-04-16 14:24:56 -0700184 if (!graft)
185 continue;
Junio C Hamano5040f172006-04-06 23:58:51 -0700186 if (register_commit_graft(graft, 1))
Johannes Schindeline228c172013-12-27 21:49:57 +0100187 error("duplicate graft data: %s", buf.buf);
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700188 }
189 fclose(fp);
Johannes Schindeline228c172013-12-27 21:49:57 +0100190 strbuf_release(&buf);
Junio C Hamano5040f172006-04-06 23:58:51 -0700191 return 0;
192}
193
194static void prepare_commit_graft(void)
195{
196 static int commit_graft_prepared;
197 char *graft_file;
198
199 if (commit_graft_prepared)
200 return;
201 graft_file = get_graft_file();
202 read_graft_file(graft_file);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100203 /* make sure shallows are read */
204 is_repository_shallow();
Junio C Hamano5040f172006-04-06 23:58:51 -0700205 commit_graft_prepared = 1;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700206}
207
Stefan Beller8b65a342017-07-12 17:44:14 -0700208struct commit_graft *lookup_commit_graft(const struct object_id *oid)
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700209{
210 int pos;
Junio C Hamano5040f172006-04-06 23:58:51 -0700211 prepare_commit_graft();
Stefan Beller8b65a342017-07-12 17:44:14 -0700212 pos = commit_graft_pos(oid->hash);
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700213 if (pos < 0)
214 return NULL;
215 return commit_graft[pos];
216}
217
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700218int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
Johannes Schindelined09aef2006-10-30 20:09:06 +0100219{
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700220 int i, ret;
221 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
222 ret = fn(commit_graft[i], cb_data);
223 return ret;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100224}
225
brian m. carlsone92b8482017-05-06 22:10:06 +0000226int unregister_shallow(const struct object_id *oid)
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100227{
brian m. carlsone92b8482017-05-06 22:10:06 +0000228 int pos = commit_graft_pos(oid->hash);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100229 if (pos < 0)
230 return -1;
231 if (pos + 1 < commit_graft_nr)
René Scharfef331ab92017-07-15 22:00:45 +0200232 MOVE_ARRAY(commit_graft + pos, commit_graft + pos + 1,
233 commit_graft_nr - pos - 1);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100234 commit_graft_nr--;
235 return 0;
236}
237
Jeff King8597ea32014-06-10 17:44:13 -0400238struct commit_buffer {
239 void *buffer;
240 unsigned long size;
241};
242define_commit_slab(buffer_slab, struct commit_buffer);
Jeff Kingc1b3c712014-06-10 17:43:02 -0400243static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);
244
Jeff King8597ea32014-06-10 17:44:13 -0400245void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
Jeff King66c28272014-06-10 17:40:14 -0400246{
Jeff King8597ea32014-06-10 17:44:13 -0400247 struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
248 v->buffer = buffer;
249 v->size = size;
Jeff King66c28272014-06-10 17:40:14 -0400250}
251
Jeff King8597ea32014-06-10 17:44:13 -0400252const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
Jeff King152ff1c2014-06-10 17:40:39 -0400253{
Junio C Hamano862e7302015-05-14 15:25:52 -0700254 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
255 if (!v) {
256 if (sizep)
257 *sizep = 0;
258 return NULL;
259 }
Jeff King8597ea32014-06-10 17:44:13 -0400260 if (sizep)
261 *sizep = v->size;
262 return v->buffer;
Jeff King152ff1c2014-06-10 17:40:39 -0400263}
264
Jeff King8597ea32014-06-10 17:44:13 -0400265const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
Jeff King152ff1c2014-06-10 17:40:39 -0400266{
Jeff King8597ea32014-06-10 17:44:13 -0400267 const void *ret = get_cached_commit_buffer(commit, sizep);
Jeff King152ff1c2014-06-10 17:40:39 -0400268 if (!ret) {
269 enum object_type type;
270 unsigned long size;
brian m. carlsoned1c9972015-11-10 02:22:29 +0000271 ret = read_sha1_file(commit->object.oid.hash, &type, &size);
Jeff King152ff1c2014-06-10 17:40:39 -0400272 if (!ret)
273 die("cannot read commit object %s",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000274 oid_to_hex(&commit->object.oid));
Jeff King152ff1c2014-06-10 17:40:39 -0400275 if (type != OBJ_COMMIT)
276 die("expected commit for %s, got %s",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000277 oid_to_hex(&commit->object.oid), typename(type));
Jeff King8597ea32014-06-10 17:44:13 -0400278 if (sizep)
279 *sizep = size;
Jeff King152ff1c2014-06-10 17:40:39 -0400280 }
281 return ret;
282}
283
284void unuse_commit_buffer(const struct commit *commit, const void *buffer)
285{
Junio C Hamano862e7302015-05-14 15:25:52 -0700286 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
287 if (!(v && v->buffer == buffer))
Jeff King152ff1c2014-06-10 17:40:39 -0400288 free((void *)buffer);
289}
290
Jeff King0fb370d2014-06-12 18:05:37 -0400291void free_commit_buffer(struct commit *commit)
292{
Junio C Hamano862e7302015-05-14 15:25:52 -0700293 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
294 if (v) {
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +0000295 FREE_AND_NULL(v->buffer);
Junio C Hamano862e7302015-05-14 15:25:52 -0700296 v->size = 0;
297 }
Jeff King0fb370d2014-06-12 18:05:37 -0400298}
299
Jeff King8597ea32014-06-10 17:44:13 -0400300const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
Jeff King0fb370d2014-06-12 18:05:37 -0400301{
Junio C Hamano862e7302015-05-14 15:25:52 -0700302 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
Jeff King8597ea32014-06-10 17:44:13 -0400303 void *ret;
304
Junio C Hamano862e7302015-05-14 15:25:52 -0700305 if (!v) {
306 if (sizep)
307 *sizep = 0;
308 return NULL;
309 }
Jeff King8597ea32014-06-10 17:44:13 -0400310 ret = v->buffer;
311 if (sizep)
312 *sizep = v->size;
313
314 v->buffer = NULL;
315 v->size = 0;
Jeff King0fb370d2014-06-12 18:05:37 -0400316 return ret;
317}
318
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 17:52:20 +0700319int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
Daniel Barkalow175785e2005-04-18 11:39:48 -0700320{
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 17:52:20 +0700321 const char *tail = buffer;
322 const char *bufptr = buffer;
brian m. carlson7683e2e2015-03-13 23:39:34 +0000323 struct object_id parent;
Linus Torvalds6c88be12005-06-20 20:26:03 -0700324 struct commit_list **pptr;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700325 struct commit_graft *graft;
brian m. carlson7683e2e2015-03-13 23:39:34 +0000326 const int tree_entry_len = GIT_SHA1_HEXSZ + 5;
327 const int parent_entry_len = GIT_SHA1_HEXSZ + 7;
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400328
Daniel Barkalow175785e2005-04-18 11:39:48 -0700329 if (item->object.parsed)
330 return 0;
331 item->object.parsed = 1;
Junio C Hamano3b44f152006-06-28 03:51:00 -0700332 tail += size;
brian m. carlson7683e2e2015-03-13 23:39:34 +0000333 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
334 bufptr[tree_entry_len] != '\n')
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000335 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
brian m. carlson7683e2e2015-03-13 23:39:34 +0000336 if (get_sha1_hex(bufptr + 5, parent.hash) < 0)
Junio C Hamanobd2afde2006-02-22 17:47:10 -0800337 return error("bad tree pointer in commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000338 oid_to_hex(&item->object.oid));
brian m. carlson740ee052017-05-06 22:10:17 +0000339 item->tree = lookup_tree(&parent);
brian m. carlson7683e2e2015-03-13 23:39:34 +0000340 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
Linus Torvalds6c88be12005-06-20 20:26:03 -0700341 pptr = &item->parents;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700342
Stefan Beller8b65a342017-07-12 17:44:14 -0700343 graft = lookup_commit_graft(&item->object.oid);
brian m. carlson7683e2e2015-03-13 23:39:34 +0000344 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
Linus Torvaldsf7cc77d2005-07-27 15:12:48 -0700345 struct commit *new_parent;
346
brian m. carlson7683e2e2015-03-13 23:39:34 +0000347 if (tail <= bufptr + parent_entry_len + 1 ||
348 get_sha1_hex(bufptr + 7, parent.hash) ||
349 bufptr[parent_entry_len] != '\n')
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000350 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
brian m. carlson7683e2e2015-03-13 23:39:34 +0000351 bufptr += parent_entry_len + 1;
Johannes Schindelin7f3140c2009-07-23 17:33:49 +0200352 /*
353 * The clone is shallow if nr_parent < 0, and we must
354 * not traverse its real parents even when we unhide them.
355 */
356 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700357 continue;
brian m. carlsonbc832662017-05-06 22:10:10 +0000358 new_parent = lookup_commit(&parent);
Miklos Vajna39468de2008-06-07 22:38:37 +0200359 if (new_parent)
Linus Torvalds6c88be12005-06-20 20:26:03 -0700360 pptr = &commit_list_insert(new_parent, pptr)->next;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700361 }
362 if (graft) {
363 int i;
364 struct commit *new_parent;
365 for (i = 0; i < graft->nr_parent; i++) {
brian m. carlsonbc832662017-05-06 22:10:10 +0000366 new_parent = lookup_commit(&graft->parent[i]);
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700367 if (!new_parent)
368 continue;
369 pptr = &commit_list_insert(new_parent, pptr)->next;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700370 }
Daniel Barkalow175785e2005-04-18 11:39:48 -0700371 }
Martin Koegler0a617792008-01-19 18:35:23 +0100372 item->date = parse_commit_date(bufptr, tail);
Junio C Hamano27dedf02005-11-16 21:32:44 -0800373
Daniel Barkalow175785e2005-04-18 11:39:48 -0700374 return 0;
375}
376
Jeff King9cc2b072015-06-01 05:56:26 -0400377int parse_commit_gently(struct commit *item, int quiet_on_missing)
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400378{
Nicolas Pitre21666f12007-02-26 14:55:59 -0500379 enum object_type type;
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400380 void *buffer;
381 unsigned long size;
382 int ret;
383
Martin Koegler9786f682008-02-18 21:48:02 +0100384 if (!item)
385 return -1;
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400386 if (item->object.parsed)
387 return 0;
brian m. carlsoned1c9972015-11-10 02:22:29 +0000388 buffer = read_sha1_file(item->object.oid.hash, &type, &size);
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400389 if (!buffer)
Jeff King9cc2b072015-06-01 05:56:26 -0400390 return quiet_on_missing ? -1 :
391 error("Could not read %s",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000392 oid_to_hex(&item->object.oid));
Nicolas Pitre21666f12007-02-26 14:55:59 -0500393 if (type != OBJ_COMMIT) {
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400394 free(buffer);
395 return error("Object %s not a commit",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000396 oid_to_hex(&item->object.oid));
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400397 }
398 ret = parse_commit_buffer(item, buffer, size);
Linus Torvalds60ab26d2005-09-15 14:43:17 -0700399 if (save_commit_buffer && !ret) {
Jeff King8597ea32014-06-10 17:44:13 -0400400 set_commit_buffer(item, buffer, size);
Linus Torvalds3ff1fbb2005-05-25 18:27:14 -0700401 return 0;
402 }
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400403 free(buffer);
404 return ret;
405}
406
Jeff King7059dcc2013-10-24 04:52:36 -0400407void parse_commit_or_die(struct commit *item)
408{
409 if (parse_commit(item))
410 die("unable to parse commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000411 item ? oid_to_hex(&item->object.oid) : "(null)");
Jeff King7059dcc2013-10-24 04:52:36 -0400412}
413
Christian Couder11af2aa2010-07-22 15:18:30 +0200414int find_commit_subject(const char *commit_buffer, const char **subject)
415{
416 const char *eol;
417 const char *p = commit_buffer;
418
419 while (*p && (*p != '\n' || p[1] != '\n'))
420 p++;
421 if (*p) {
Johannes Schindelin4e1b06d2016-06-22 22:20:20 +0200422 p = skip_blank_lines(p + 2);
Junio C Hamano9c9b03b2017-01-27 18:01:41 -0800423 eol = strchrnul(p, '\n');
Christian Couder11af2aa2010-07-22 15:18:30 +0200424 } else
425 eol = p;
426
427 *subject = p;
428
429 return eol - p;
430}
431
Linus Torvaldsac5155e2005-05-30 18:44:02 -0700432struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700433{
Christopher Li812666c2005-04-26 12:00:58 -0700434 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700435 new_list->item = item;
436 new_list->next = *list_p;
437 *list_p = new_list;
Linus Torvaldsac5155e2005-05-30 18:44:02 -0700438 return new_list;
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700439}
440
Miklos Vajna65319472008-06-27 18:21:55 +0200441unsigned commit_list_count(const struct commit_list *l)
442{
443 unsigned c = 0;
444 for (; l; l = l->next )
445 c++;
446 return c;
447}
448
Thomas Rast53d00b32013-07-31 22:13:20 +0200449struct commit_list *copy_commit_list(struct commit_list *list)
450{
451 struct commit_list *head = NULL;
452 struct commit_list **pp = &head;
453 while (list) {
René Scharfecb979db2014-07-10 11:47:47 +0200454 pp = commit_list_append(list->item, pp);
Thomas Rast53d00b32013-07-31 22:13:20 +0200455 list = list->next;
456 }
457 return head;
458}
459
Daniel Barkalow175785e2005-04-18 11:39:48 -0700460void free_commit_list(struct commit_list *list)
461{
René Scharfee510ab82015-10-24 18:21:31 +0200462 while (list)
463 pop_commit(&list);
Daniel Barkalow175785e2005-04-18 11:39:48 -0700464}
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700465
Thiago Farina47e44ed2010-11-26 23:58:14 -0200466struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700467{
468 struct commit_list **pp = list;
469 struct commit_list *p;
470 while ((p = *pp) != NULL) {
471 if (p->item->date < item->date) {
472 break;
473 }
474 pp = &p->next;
475 }
Linus Torvaldsf7554942005-07-06 09:31:17 -0700476 return commit_list_insert(item, pp);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700477}
478
René Scharfe46905892012-04-01 00:10:39 +0200479static int commit_list_compare_by_date(const void *a, const void *b)
480{
Johannes Schindelindddbad72017-04-26 21:29:31 +0200481 timestamp_t a_date = ((const struct commit_list *)a)->item->date;
482 timestamp_t b_date = ((const struct commit_list *)b)->item->date;
René Scharfe46905892012-04-01 00:10:39 +0200483 if (a_date < b_date)
484 return 1;
485 if (a_date > b_date)
486 return -1;
487 return 0;
488}
489
490static void *commit_list_get_next(const void *a)
491{
492 return ((const struct commit_list *)a)->next;
493}
494
495static void commit_list_set_next(void *a, void *next)
496{
497 ((struct commit_list *)a)->next = next;
498}
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700499
Thiago Farina47e44ed2010-11-26 23:58:14 -0200500void commit_list_sort_by_date(struct commit_list **list)
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700501{
Junio C Hamano7365c952012-04-17 11:07:01 -0700502 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
503 commit_list_compare_by_date);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700504}
505
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700506struct commit *pop_most_recent_commit(struct commit_list **list,
507 unsigned int mark)
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700508{
René Scharfee510ab82015-10-24 18:21:31 +0200509 struct commit *ret = pop_commit(list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700510 struct commit_list *parents = ret->parents;
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700511
512 while (parents) {
Linus Torvalds4056c092005-04-23 19:21:28 -0700513 struct commit *commit = parents->item;
Martin Koeglerdec38c82008-02-18 21:48:03 +0100514 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700515 commit->object.flags |= mark;
Thiago Farina47e44ed2010-11-26 23:58:14 -0200516 commit_list_insert_by_date(commit, list);
Linus Torvalds4056c092005-04-23 19:21:28 -0700517 }
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700518 parents = parents->next;
519 }
520 return ret;
521}
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700522
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700523static void clear_commit_marks_1(struct commit_list **plist,
524 struct commit *commit, unsigned int mark)
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800525{
Johannes Schindelin60fcc2e2007-10-10 23:14:35 +0100526 while (commit) {
527 struct commit_list *parents;
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800528
Johannes Schindelin60fcc2e2007-10-10 23:14:35 +0100529 if (!(mark & commit->object.flags))
530 return;
Junio C Hamano58ecf5c2006-07-04 17:45:22 -0700531
Johannes Schindelin60fcc2e2007-10-10 23:14:35 +0100532 commit->object.flags &= ~mark;
533
534 parents = commit->parents;
535 if (!parents)
536 return;
537
538 while ((parents = parents->next))
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700539 commit_list_insert(parents->item, plist);
Johannes Schindelin60fcc2e2007-10-10 23:14:35 +0100540
541 commit = commit->parents->item;
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800542 }
543}
544
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800545void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700546{
547 struct commit_list *list = NULL;
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800548
549 while (nr--) {
550 commit_list_insert(*commit, &list);
551 commit++;
552 }
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700553 while (list)
554 clear_commit_marks_1(&list, pop_commit(&list), mark);
555}
556
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800557void clear_commit_marks(struct commit *commit, unsigned int mark)
558{
559 clear_commit_marks_many(1, &commit, mark);
560}
561
René Scharfe86a0a402011-10-01 18:16:08 +0200562void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
563{
564 struct object *object;
565 struct commit *commit;
566 unsigned int i;
567
568 for (i = 0; i < a->nr; i++) {
569 object = a->objects[i].item;
brian m. carlsonbc832662017-05-06 22:10:10 +0000570 commit = lookup_commit_reference_gently(&object->oid, 1);
René Scharfe86a0a402011-10-01 18:16:08 +0200571 if (commit)
572 clear_commit_marks(commit, mark);
573 }
574}
575
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +0000576struct commit *pop_commit(struct commit_list **stack)
577{
578 struct commit_list *top = *stack;
579 struct commit *item = top ? top->item : NULL;
580
581 if (top) {
582 *stack = top->next;
583 free(top);
584 }
585 return item;
586}
587
Jon Seymourab580ac2005-07-07 02:39:34 +1000588/*
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700589 * Topological sort support
590 */
Junio C Hamano66eb3752013-04-12 23:25:49 -0700591
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700592/* count number of children that have not been emitted */
593define_commit_slab(indegree_slab, int);
Jeff King96c4f4a2013-04-09 02:52:56 -0400594
Junio C Hamano81c6b382013-06-07 10:35:54 -0700595/* record author-date for each commit object */
596define_commit_slab(author_date_slab, unsigned long);
597
598static void record_author_date(struct author_date_slab *author_date,
599 struct commit *commit)
600{
Jeff King8597ea32014-06-10 17:44:13 -0400601 const char *buffer = get_commit_buffer(commit, NULL);
Junio C Hamano81c6b382013-06-07 10:35:54 -0700602 struct ident_split ident;
Jeff Kingea5517f2014-08-27 03:56:55 -0400603 const char *ident_line;
604 size_t ident_len;
Junio C Hamano81c6b382013-06-07 10:35:54 -0700605 char *date_end;
Johannes Schindelindddbad72017-04-26 21:29:31 +0200606 timestamp_t date;
Junio C Hamano81c6b382013-06-07 10:35:54 -0700607
Jeff Kingea5517f2014-08-27 03:56:55 -0400608 ident_line = find_commit_header(buffer, "author", &ident_len);
609 if (!ident_line)
610 goto fail_exit; /* no author line */
611 if (split_ident_line(&ident, ident_line, ident_len) ||
612 !ident.date_begin || !ident.date_end)
613 goto fail_exit; /* malformed "author" line */
Junio C Hamano81c6b382013-06-07 10:35:54 -0700614
Johannes Schindelin1aeb7e72017-04-21 12:45:44 +0200615 date = parse_timestamp(ident.date_begin, &date_end, 10);
Junio C Hamano81c6b382013-06-07 10:35:54 -0700616 if (date_end != ident.date_end)
617 goto fail_exit; /* malformed date */
618 *(author_date_slab_at(author_date, commit)) = date;
619
620fail_exit:
Jeff Kingba41c1c2014-06-10 17:41:02 -0400621 unuse_commit_buffer(commit, buffer);
Junio C Hamano81c6b382013-06-07 10:35:54 -0700622}
623
624static int compare_commits_by_author_date(const void *a_, const void *b_,
625 void *cb_data)
626{
627 const struct commit *a = a_, *b = b_;
628 struct author_date_slab *author_date = cb_data;
Johannes Schindelindddbad72017-04-26 21:29:31 +0200629 timestamp_t a_date = *(author_date_slab_at(author_date, a));
630 timestamp_t b_date = *(author_date_slab_at(author_date, b));
Junio C Hamano81c6b382013-06-07 10:35:54 -0700631
632 /* newer commits with larger date first */
633 if (a_date < b_date)
634 return 1;
635 else if (a_date > b_date)
636 return -1;
637 return 0;
638}
639
Jeff King727377f2013-07-02 02:21:48 -0400640int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
Junio C Hamanoda24b102013-06-06 21:58:12 -0700641{
642 const struct commit *a = a_, *b = b_;
643 /* newer commits with larger date first */
644 if (a->date < b->date)
645 return 1;
646 else if (a->date > b->date)
647 return -1;
648 return 0;
649}
650
Jon Seymourab580ac2005-07-07 02:39:34 +1000651/*
652 * Performs an in-place topological sort on the list supplied.
653 */
Junio C Hamanoda24b102013-06-06 21:58:12 -0700654void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
Jon Seymourab580ac2005-07-07 02:39:34 +1000655{
Linus Torvalds23c17d42007-11-02 13:32:58 -0700656 struct commit_list *next, *orig = *list;
Linus Torvalds23c17d42007-11-02 13:32:58 -0700657 struct commit_list **pptr;
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700658 struct indegree_slab indegree;
Junio C Hamanoda24b102013-06-06 21:58:12 -0700659 struct prio_queue queue;
660 struct commit *commit;
Junio C Hamano81c6b382013-06-07 10:35:54 -0700661 struct author_date_slab author_date;
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +0100662
Linus Torvalds23c17d42007-11-02 13:32:58 -0700663 if (!orig)
Eric Wong7d6fb372005-12-24 04:12:43 -0800664 return;
Linus Torvalds23c17d42007-11-02 13:32:58 -0700665 *list = NULL;
666
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700667 init_indegree_slab(&indegree);
Junio C Hamanoda24b102013-06-06 21:58:12 -0700668 memset(&queue, '\0', sizeof(queue));
Junio C Hamano81c6b382013-06-07 10:35:54 -0700669
Junio C Hamanoda24b102013-06-06 21:58:12 -0700670 switch (sort_order) {
671 default: /* REV_SORT_IN_GRAPH_ORDER */
672 queue.compare = NULL;
673 break;
674 case REV_SORT_BY_COMMIT_DATE:
675 queue.compare = compare_commits_by_commit_date;
676 break;
Junio C Hamano81c6b382013-06-07 10:35:54 -0700677 case REV_SORT_BY_AUTHOR_DATE:
678 init_author_date_slab(&author_date);
679 queue.compare = compare_commits_by_author_date;
680 queue.cb_data = &author_date;
681 break;
Junio C Hamanoda24b102013-06-06 21:58:12 -0700682 }
Jeff King96c4f4a2013-04-09 02:52:56 -0400683
Linus Torvalds23c17d42007-11-02 13:32:58 -0700684 /* Mark them and clear the indegree */
685 for (next = orig; next; next = next->next) {
686 struct commit *commit = next->item;
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700687 *(indegree_slab_at(&indegree, commit)) = 1;
Junio C Hamano81c6b382013-06-07 10:35:54 -0700688 /* also record the author dates, if needed */
689 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
690 record_author_date(&author_date, commit);
Jon Seymourab580ac2005-07-07 02:39:34 +1000691 }
Linus Torvalds23c17d42007-11-02 13:32:58 -0700692
Jon Seymourab580ac2005-07-07 02:39:34 +1000693 /* update the indegree */
Linus Torvalds23c17d42007-11-02 13:32:58 -0700694 for (next = orig; next; next = next->next) {
Junio C Hamanoda24b102013-06-06 21:58:12 -0700695 struct commit_list *parents = next->item->parents;
Jon Seymourab580ac2005-07-07 02:39:34 +1000696 while (parents) {
Linus Torvalds23c17d42007-11-02 13:32:58 -0700697 struct commit *parent = parents->item;
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700698 int *pi = indegree_slab_at(&indegree, parent);
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +0100699
Jeff King96c4f4a2013-04-09 02:52:56 -0400700 if (*pi)
701 (*pi)++;
Linus Torvalds23c17d42007-11-02 13:32:58 -0700702 parents = parents->next;
Jon Seymourab580ac2005-07-07 02:39:34 +1000703 }
Jon Seymourab580ac2005-07-07 02:39:34 +1000704 }
Linus Torvalds23c17d42007-11-02 13:32:58 -0700705
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700706 /*
Pierre Habouzit674d1722007-09-10 12:35:06 +0200707 * find the tips
708 *
709 * tips are nodes not reachable from any other node in the list
710 *
711 * the tips serve as a starting set for the work queue.
712 */
Linus Torvalds23c17d42007-11-02 13:32:58 -0700713 for (next = orig; next; next = next->next) {
714 struct commit *commit = next->item;
Jon Seymourab580ac2005-07-07 02:39:34 +1000715
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700716 if (*(indegree_slab_at(&indegree, commit)) == 1)
Junio C Hamanoda24b102013-06-06 21:58:12 -0700717 prio_queue_put(&queue, commit);
Jon Seymourab580ac2005-07-07 02:39:34 +1000718 }
Junio C Hamano4c8725f2006-02-15 22:05:33 -0800719
Junio C Hamanoda24b102013-06-06 21:58:12 -0700720 /*
721 * This is unfortunate; the initial tips need to be shown
722 * in the order given from the revision traversal machinery.
723 */
724 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
725 prio_queue_reverse(&queue);
726
727 /* We no longer need the commit list */
728 free_commit_list(orig);
Linus Torvalds23c17d42007-11-02 13:32:58 -0700729
730 pptr = list;
731 *list = NULL;
Junio C Hamanoda24b102013-06-06 21:58:12 -0700732 while ((commit = prio_queue_get(&queue)) != NULL) {
733 struct commit_list *parents;
Jon Seymourab580ac2005-07-07 02:39:34 +1000734
Linus Torvalds23c17d42007-11-02 13:32:58 -0700735 for (parents = commit->parents; parents ; parents = parents->next) {
Junio C Hamanocd2b8ae2011-08-25 14:46:52 -0700736 struct commit *parent = parents->item;
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700737 int *pi = indegree_slab_at(&indegree, parent);
Linus Torvalds23c17d42007-11-02 13:32:58 -0700738
Jeff King96c4f4a2013-04-09 02:52:56 -0400739 if (!*pi)
Linus Torvalds23c17d42007-11-02 13:32:58 -0700740 continue;
741
742 /*
743 * parents are only enqueued for emission
744 * when all their children have been emitted thereby
745 * guaranteeing topological order.
746 */
Junio C Hamanoda24b102013-06-06 21:58:12 -0700747 if (--(*pi) == 1)
748 prio_queue_put(&queue, parent);
Jon Seymourab580ac2005-07-07 02:39:34 +1000749 }
750 /*
Junio C Hamanoda24b102013-06-06 21:58:12 -0700751 * all children of commit have already been
752 * emitted. we can emit it now.
Pierre Habouzit674d1722007-09-10 12:35:06 +0200753 */
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700754 *(indegree_slab_at(&indegree, commit)) = 0;
Junio C Hamanoda24b102013-06-06 21:58:12 -0700755
756 pptr = &commit_list_insert(commit, pptr)->next;
Jon Seymourab580ac2005-07-07 02:39:34 +1000757 }
Jeff King96c4f4a2013-04-09 02:52:56 -0400758
Junio C Hamanoa84b7942013-04-13 11:56:41 -0700759 clear_indegree_slab(&indegree);
Junio C Hamanoda24b102013-06-06 21:58:12 -0700760 clear_prio_queue(&queue);
Junio C Hamano81c6b382013-06-07 10:35:54 -0700761 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
762 clear_author_date_slab(&author_date);
Jon Seymourab580ac2005-07-07 02:39:34 +1000763}
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200764
Junio C Hamano12952282007-01-08 23:10:49 -0800765/* merge-base stuff */
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200766
Nguyễn Thái Ngọc Duy208acbf2014-03-25 20:23:26 +0700767/* Remember to update object flag allocation in object.h */
Junio C Hamano577ed5c2006-10-22 17:32:47 -0700768#define PARENT1 (1u<<16)
769#define PARENT2 (1u<<17)
770#define STALE (1u<<18)
771#define RESULT (1u<<19)
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200772
Junio C Hamano12952282007-01-08 23:10:49 -0800773static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
774
Jeff King73f43f22014-07-14 01:53:54 -0400775static int queue_has_nonstale(struct prio_queue *queue)
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200776{
Jeff King73f43f22014-07-14 01:53:54 -0400777 int i;
778 for (i = 0; i < queue->nr; i++) {
779 struct commit *commit = queue->array[i].data;
780 if (!(commit->object.flags & STALE))
781 return 1;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200782 }
Jeff King73f43f22014-07-14 01:53:54 -0400783 return 0;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200784}
785
Junio C Hamanod8669242012-10-04 15:37:15 -0700786/* all input commits in one and twos[] must have been parsed! */
Junio C Hamanoda1f5152012-08-30 14:39:03 -0700787static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200788{
Jeff King73f43f22014-07-14 01:53:54 -0400789 struct prio_queue queue = { compare_commits_by_commit_date };
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200790 struct commit_list *result = NULL;
Junio C Hamano6a938642008-06-27 18:22:02 +0200791 int i;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200792
Junio C Hamanof3249432006-07-04 18:46:42 -0700793 one->object.flags |= PARENT1;
Jeff King73f43f22014-07-14 01:53:54 -0400794 if (!n) {
795 commit_list_append(one, &result);
796 return result;
797 }
798 prio_queue_put(&queue, one);
799
Junio C Hamano6a938642008-06-27 18:22:02 +0200800 for (i = 0; i < n; i++) {
801 twos[i]->object.flags |= PARENT2;
Jeff King73f43f22014-07-14 01:53:54 -0400802 prio_queue_put(&queue, twos[i]);
Junio C Hamano6a938642008-06-27 18:22:02 +0200803 }
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200804
Jeff King73f43f22014-07-14 01:53:54 -0400805 while (queue_has_nonstale(&queue)) {
806 struct commit *commit = prio_queue_get(&queue);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200807 struct commit_list *parents;
Junio C Hamanof3249432006-07-04 18:46:42 -0700808 int flags;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200809
Junio C Hamanof3249432006-07-04 18:46:42 -0700810 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200811 if (flags == (PARENT1 | PARENT2)) {
Junio C Hamanof3249432006-07-04 18:46:42 -0700812 if (!(commit->object.flags & RESULT)) {
813 commit->object.flags |= RESULT;
Thiago Farina47e44ed2010-11-26 23:58:14 -0200814 commit_list_insert_by_date(commit, &result);
Junio C Hamanof3249432006-07-04 18:46:42 -0700815 }
Junio C Hamano542ccef2006-07-02 11:34:17 -0700816 /* Mark parents of a found merge stale */
817 flags |= STALE;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200818 }
819 parents = commit->parents;
820 while (parents) {
821 struct commit *p = parents->item;
822 parents = parents->next;
823 if ((p->object.flags & flags) == flags)
824 continue;
Martin Koegler172947e2008-02-18 21:47:57 +0100825 if (parse_commit(p))
826 return NULL;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200827 p->object.flags |= flags;
Jeff King73f43f22014-07-14 01:53:54 -0400828 prio_queue_put(&queue, p);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200829 }
830 }
831
Jeff King73f43f22014-07-14 01:53:54 -0400832 clear_prio_queue(&queue);
Junio C Hamanoda1f5152012-08-30 14:39:03 -0700833 return result;
834}
835
836static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
837{
838 struct commit_list *list = NULL;
839 struct commit_list *result = NULL;
840 int i;
841
842 for (i = 0; i < n; i++) {
843 if (one == twos[i])
844 /*
845 * We do not mark this even with RESULT so we do not
846 * have to clean it up.
847 */
848 return commit_list_insert(one, &result);
849 }
850
851 if (parse_commit(one))
852 return NULL;
853 for (i = 0; i < n; i++) {
854 if (parse_commit(twos[i]))
855 return NULL;
856 }
857
858 list = paint_down_to_common(one, n, twos);
859
Junio C Hamanof3249432006-07-04 18:46:42 -0700860 while (list) {
René Scharfee510ab82015-10-24 18:21:31 +0200861 struct commit *commit = pop_commit(&list);
862 if (!(commit->object.flags & STALE))
863 commit_list_insert_by_date(commit, &result);
Junio C Hamanof3249432006-07-04 18:46:42 -0700864 }
865 return result;
866}
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200867
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200868struct commit_list *get_octopus_merge_bases(struct commit_list *in)
869{
870 struct commit_list *i, *j, *k, *ret = NULL;
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200871
Vasily Makarov6bc76722014-01-03 18:45:46 +0400872 if (!in)
873 return ret;
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200874
Vasily Makarov6bc76722014-01-03 18:45:46 +0400875 commit_list_insert(in->item, &ret);
876
877 for (i = in->next; i; i = i->next) {
878 struct commit_list *new = NULL, *end = NULL;
879
880 for (j = ret; j; j = j->next) {
881 struct commit_list *bases;
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700882 bases = get_merge_bases(i->item, j->item);
Vasily Makarov6bc76722014-01-03 18:45:46 +0400883 if (!new)
884 new = bases;
885 else
886 end->next = bases;
887 for (k = bases; k; k = k->next)
888 end = k;
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200889 }
Vasily Makarov6bc76722014-01-03 18:45:46 +0400890 ret = new;
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200891 }
892 return ret;
893}
894
Junio C Hamano94f0ced2012-08-30 15:35:39 -0700895static int remove_redundant(struct commit **array, int cnt)
896{
897 /*
898 * Some commit in the array may be an ancestor of
899 * another commit. Move such commit to the end of
900 * the array, and return the number of commits that
901 * are independent from each other.
902 */
903 struct commit **work;
904 unsigned char *redundant;
905 int *filled_index;
906 int i, j, filled;
907
908 work = xcalloc(cnt, sizeof(*work));
909 redundant = xcalloc(cnt, 1);
Jeff Kingb32fa952016-02-22 17:44:25 -0500910 ALLOC_ARRAY(filled_index, cnt - 1);
Junio C Hamano94f0ced2012-08-30 15:35:39 -0700911
Junio C Hamanod8669242012-10-04 15:37:15 -0700912 for (i = 0; i < cnt; i++)
913 parse_commit(array[i]);
Junio C Hamano94f0ced2012-08-30 15:35:39 -0700914 for (i = 0; i < cnt; i++) {
915 struct commit_list *common;
916
917 if (redundant[i])
918 continue;
919 for (j = filled = 0; j < cnt; j++) {
920 if (i == j || redundant[j])
921 continue;
922 filled_index[filled] = j;
923 work[filled++] = array[j];
924 }
925 common = paint_down_to_common(array[i], filled, work);
926 if (array[i]->object.flags & PARENT2)
927 redundant[i] = 1;
928 for (j = 0; j < filled; j++)
929 if (work[j]->object.flags & PARENT1)
930 redundant[filled_index[j]] = 1;
931 clear_commit_marks(array[i], all_flags);
932 for (j = 0; j < filled; j++)
933 clear_commit_marks(work[j], all_flags);
934 free_commit_list(common);
935 }
936
937 /* Now collect the result */
René Scharfe45ccef82016-09-25 09:24:03 +0200938 COPY_ARRAY(work, array, cnt);
Junio C Hamano94f0ced2012-08-30 15:35:39 -0700939 for (i = filled = 0; i < cnt; i++)
940 if (!redundant[i])
941 array[filled++] = work[i];
942 for (j = filled, i = 0; i < cnt; i++)
943 if (redundant[i])
944 array[j++] = work[i];
945 free(work);
946 free(redundant);
947 free(filled_index);
948 return filled;
949}
950
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700951static struct commit_list *get_merge_bases_many_0(struct commit *one,
952 int n,
953 struct commit **twos,
954 int cleanup)
Junio C Hamanof3249432006-07-04 18:46:42 -0700955{
Junio C Hamanof3249432006-07-04 18:46:42 -0700956 struct commit_list *list;
957 struct commit **rslt;
958 struct commit_list *result;
Junio C Hamano94f0ced2012-08-30 15:35:39 -0700959 int cnt, i;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200960
Junio C Hamano6a938642008-06-27 18:22:02 +0200961 result = merge_bases_many(one, n, twos);
962 for (i = 0; i < n; i++) {
963 if (one == twos[i])
964 return result;
965 }
Junio C Hamanof3249432006-07-04 18:46:42 -0700966 if (!result || !result->next) {
967 if (cleanup) {
968 clear_commit_marks(one, all_flags);
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800969 clear_commit_marks_many(n, twos, all_flags);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200970 }
Junio C Hamanof3249432006-07-04 18:46:42 -0700971 return result;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200972 }
973
Junio C Hamanof3249432006-07-04 18:46:42 -0700974 /* There are more than one */
René Scharfe4bbaa1e2014-07-17 01:52:09 +0200975 cnt = commit_list_count(result);
Junio C Hamanof3249432006-07-04 18:46:42 -0700976 rslt = xcalloc(cnt, sizeof(*rslt));
977 for (list = result, i = 0; list; list = list->next)
978 rslt[i++] = list->item;
979 free_commit_list(result);
980
981 clear_commit_marks(one, all_flags);
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800982 clear_commit_marks_many(n, twos, all_flags);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200983
Junio C Hamano94f0ced2012-08-30 15:35:39 -0700984 cnt = remove_redundant(rslt, cnt);
Junio C Hamanof3249432006-07-04 18:46:42 -0700985 result = NULL;
Junio C Hamano94f0ced2012-08-30 15:35:39 -0700986 for (i = 0; i < cnt; i++)
987 commit_list_insert_by_date(rslt[i], &result);
Junio C Hamanof3249432006-07-04 18:46:42 -0700988 free(rslt);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200989 return result;
990}
Junio C Hamano2ecd2bb2006-12-19 00:14:04 -0800991
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700992struct commit_list *get_merge_bases_many(struct commit *one,
993 int n,
994 struct commit **twos)
Junio C Hamano6a938642008-06-27 18:22:02 +0200995{
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700996 return get_merge_bases_many_0(one, n, twos, 1);
997}
998
999struct commit_list *get_merge_bases_many_dirty(struct commit *one,
1000 int n,
1001 struct commit **twos)
1002{
1003 return get_merge_bases_many_0(one, n, twos, 0);
1004}
1005
1006struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
1007{
1008 return get_merge_bases_many_0(one, 1, &two, 1);
Junio C Hamano6a938642008-06-27 18:22:02 +02001009}
1010
Junio C Hamanoa20efee2012-08-27 14:46:01 -07001011/*
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +02001012 * Is "commit" a descendant of one of the elements on the "with_commit" list?
Junio C Hamanoa20efee2012-08-27 14:46:01 -07001013 */
Jake Goulding7fcdb362009-01-26 09:13:24 -05001014int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
1015{
1016 if (!with_commit)
1017 return 1;
1018 while (with_commit) {
1019 struct commit *other;
1020
1021 other = with_commit->item;
1022 with_commit = with_commit->next;
Junio C Hamanoa20efee2012-08-27 14:46:01 -07001023 if (in_merge_bases(other, commit))
Jake Goulding7fcdb362009-01-26 09:13:24 -05001024 return 1;
1025 }
1026 return 0;
1027}
1028
Junio C Hamanoa20efee2012-08-27 14:46:01 -07001029/*
Junio C Hamano4c4b27e2013-03-04 10:16:42 -08001030 * Is "commit" an ancestor of one of the "references"?
1031 */
1032int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
1033{
1034 struct commit_list *bases;
1035 int ret = 0, i;
1036
1037 if (parse_commit(commit))
1038 return ret;
1039 for (i = 0; i < nr_reference; i++)
1040 if (parse_commit(reference[i]))
1041 return ret;
1042
1043 bases = paint_down_to_common(commit, nr_reference, reference);
1044 if (commit->object.flags & PARENT2)
1045 ret = 1;
1046 clear_commit_marks(commit, all_flags);
Junio C Hamano557899f2013-03-05 11:56:03 -08001047 clear_commit_marks_many(nr_reference, reference, all_flags);
Junio C Hamano4c4b27e2013-03-04 10:16:42 -08001048 free_commit_list(bases);
1049 return ret;
1050}
1051
1052/*
Junio C Hamanoa20efee2012-08-27 14:46:01 -07001053 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1054 */
1055int in_merge_bases(struct commit *commit, struct commit *reference)
Junio C Hamano2ecd2bb2006-12-19 00:14:04 -08001056{
Junio C Hamano4c4b27e2013-03-04 10:16:42 -08001057 return in_merge_bases_many(commit, 1, &reference);
Junio C Hamano2ecd2bb2006-12-19 00:14:04 -08001058}
Junio C Hamano98cf9c32008-06-27 18:22:03 +02001059
1060struct commit_list *reduce_heads(struct commit_list *heads)
1061{
1062 struct commit_list *p;
1063 struct commit_list *result = NULL, **tail = &result;
Junio C Hamanof37d3c72012-08-30 23:20:40 -07001064 struct commit **array;
1065 int num_head, i;
Junio C Hamano98cf9c32008-06-27 18:22:03 +02001066
1067 if (!heads)
1068 return NULL;
1069
Junio C Hamanof37d3c72012-08-30 23:20:40 -07001070 /* Uniquify */
1071 for (p = heads; p; p = p->next)
1072 p->item->object.flags &= ~STALE;
1073 for (p = heads, num_head = 0; p; p = p->next) {
1074 if (p->item->object.flags & STALE)
Junio C Hamano711f6b22008-07-14 00:09:41 -07001075 continue;
Junio C Hamanof37d3c72012-08-30 23:20:40 -07001076 p->item->object.flags |= STALE;
1077 num_head++;
Junio C Hamano98cf9c32008-06-27 18:22:03 +02001078 }
Brian Gesiakc4a7b002014-05-27 00:33:45 +09001079 array = xcalloc(num_head, sizeof(*array));
Junio C Hamanof37d3c72012-08-30 23:20:40 -07001080 for (p = heads, i = 0; p; p = p->next) {
1081 if (p->item->object.flags & STALE) {
1082 array[i++] = p->item;
1083 p->item->object.flags &= ~STALE;
1084 }
1085 }
1086 num_head = remove_redundant(array, num_head);
1087 for (i = 0; i < num_head; i++)
1088 tail = &commit_list_insert(array[i], tail)->next;
Martin Ågrencb7b29e2017-09-23 01:34:50 +02001089 free(array);
Junio C Hamano98cf9c32008-06-27 18:22:03 +02001090 return result;
1091}
Jeff King40d52ff2010-04-01 20:05:23 -04001092
Martin Ågren4da72642017-11-07 21:39:45 +01001093void reduce_heads_replace(struct commit_list **heads)
1094{
1095 struct commit_list *result = reduce_heads(*heads);
1096 free_commit_list(*heads);
1097 *heads = result;
1098}
1099
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001100static const char gpg_sig_header[] = "gpgsig";
1101static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
1102
1103static int do_sign_commit(struct strbuf *buf, const char *keyid)
1104{
1105 struct strbuf sig = STRBUF_INIT;
1106 int inspos, copypos;
Johannes Schindelin3324dd82016-06-29 16:14:54 +02001107 const char *eoh;
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001108
1109 /* find the end of the header */
Johannes Schindelin3324dd82016-06-29 16:14:54 +02001110 eoh = strstr(buf->buf, "\n\n");
1111 if (!eoh)
1112 inspos = buf->len;
1113 else
1114 inspos = eoh - buf->buf + 1;
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001115
1116 if (!keyid || !*keyid)
1117 keyid = get_signing_key();
1118 if (sign_buffer(buf, &sig, keyid)) {
1119 strbuf_release(&sig);
1120 return -1;
1121 }
1122
1123 for (copypos = 0; sig.buf[copypos]; ) {
1124 const char *bol = sig.buf + copypos;
1125 const char *eol = strchrnul(bol, '\n');
1126 int len = (eol - bol) + !!*eol;
1127
1128 if (!copypos) {
1129 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1130 inspos += gpg_sig_header_len;
1131 }
1132 strbuf_insert(buf, inspos++, " ", 1);
1133 strbuf_insert(buf, inspos, bol, len);
1134 inspos += len;
1135 copypos += len;
1136 }
1137 strbuf_release(&sig);
1138 return 0;
1139}
1140
Jeff King218aa3a2014-06-13 02:32:11 -04001141int parse_signed_commit(const struct commit *commit,
Junio C Hamano0c37f1f2011-10-18 15:53:23 -07001142 struct strbuf *payload, struct strbuf *signature)
1143{
Junio C Hamano0c37f1f2011-10-18 15:53:23 -07001144
Jeff King218aa3a2014-06-13 02:32:11 -04001145 unsigned long size;
1146 const char *buffer = get_commit_buffer(commit, &size);
1147 int in_signature, saw_signature = -1;
1148 const char *line, *tail;
Junio C Hamano0c37f1f2011-10-18 15:53:23 -07001149
1150 line = buffer;
1151 tail = buffer + size;
1152 in_signature = 0;
1153 saw_signature = 0;
1154 while (line < tail) {
1155 const char *sig = NULL;
Jeff King218aa3a2014-06-13 02:32:11 -04001156 const char *next = memchr(line, '\n', tail - line);
Junio C Hamano0c37f1f2011-10-18 15:53:23 -07001157
1158 next = next ? next + 1 : tail;
1159 if (in_signature && line[0] == ' ')
1160 sig = line + 1;
Christian Couder59556542013-11-30 21:55:40 +01001161 else if (starts_with(line, gpg_sig_header) &&
Junio C Hamano0c37f1f2011-10-18 15:53:23 -07001162 line[gpg_sig_header_len] == ' ')
1163 sig = line + gpg_sig_header_len + 1;
1164 if (sig) {
1165 strbuf_add(signature, sig, next - sig);
1166 saw_signature = 1;
1167 in_signature = 1;
1168 } else {
1169 if (*line == '\n')
1170 /* dump the whole remainder of the buffer */
1171 next = tail;
1172 strbuf_add(payload, line, next - line);
1173 in_signature = 0;
1174 }
1175 line = next;
1176 }
Jeff King218aa3a2014-06-13 02:32:11 -04001177 unuse_commit_buffer(commit, buffer);
Junio C Hamano0c37f1f2011-10-18 15:53:23 -07001178 return saw_signature;
1179}
1180
Christian Couder0b05ab62014-07-19 17:01:12 +02001181int remove_signature(struct strbuf *buf)
1182{
1183 const char *line = buf->buf;
1184 const char *tail = buf->buf + buf->len;
1185 int in_signature = 0;
1186 const char *sig_start = NULL;
1187 const char *sig_end = NULL;
1188
1189 while (line < tail) {
1190 const char *next = memchr(line, '\n', tail - line);
1191 next = next ? next + 1 : tail;
1192
1193 if (in_signature && line[0] == ' ')
1194 sig_end = next;
1195 else if (starts_with(line, gpg_sig_header) &&
1196 line[gpg_sig_header_len] == ' ') {
1197 sig_start = line;
1198 sig_end = next;
1199 in_signature = 1;
1200 } else {
1201 if (*line == '\n')
1202 /* dump the whole remainder of the buffer */
1203 next = tail;
1204 in_signature = 0;
1205 }
1206 line = next;
1207 }
1208
1209 if (sig_start)
1210 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1211
1212 return sig_start != NULL;
1213}
1214
Junio C Hamano5231c632011-11-07 16:21:32 -08001215static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1216{
1217 struct merge_remote_desc *desc;
1218 struct commit_extra_header *mergetag;
1219 char *buf;
1220 unsigned long size, len;
1221 enum object_type type;
1222
1223 desc = merge_remote_util(parent);
1224 if (!desc || !desc->obj)
1225 return;
brian m. carlsoned1c9972015-11-10 02:22:29 +00001226 buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
Junio C Hamano5231c632011-11-07 16:21:32 -08001227 if (!buf || type != OBJ_TAG)
1228 goto free_return;
1229 len = parse_signature(buf, size);
1230 if (size == len)
1231 goto free_return;
1232 /*
1233 * We could verify this signature and either omit the tag when
1234 * it does not validate, but the integrator may not have the
1235 * public key of the signer of the tag he is merging, while a
1236 * later auditor may have it while auditing, so let's not run
1237 * verify-signed-buffer here for now...
1238 *
1239 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1240 * warn("warning: signed tag unverified.");
1241 */
1242 mergetag = xcalloc(1, sizeof(*mergetag));
1243 mergetag->key = xstrdup("mergetag");
1244 mergetag->value = buf;
1245 mergetag->len = size;
1246
1247 **tail = mergetag;
1248 *tail = &mergetag->next;
1249 return;
1250
1251free_return:
1252 free(buf);
1253}
1254
brian m. carlson434060e2015-06-21 23:14:40 +00001255int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02001256{
1257 struct strbuf payload = STRBUF_INIT;
1258 struct strbuf signature = STRBUF_INIT;
brian m. carlson434060e2015-06-21 23:14:40 +00001259 int ret = 1;
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02001260
1261 sigc->result = 'N';
1262
Jeff King218aa3a2014-06-13 02:32:11 -04001263 if (parse_signed_commit(commit, &payload, &signature) <= 0)
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02001264 goto out;
brian m. carlson434060e2015-06-21 23:14:40 +00001265 ret = check_signature(payload.buf, payload.len, signature.buf,
1266 signature.len, sigc);
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02001267
1268 out:
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02001269 strbuf_release(&payload);
1270 strbuf_release(&signature);
brian m. carlson434060e2015-06-21 23:14:40 +00001271
1272 return ret;
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02001273}
1274
1275
1276
Junio C Hamano5231c632011-11-07 16:21:32 -08001277void append_merge_tag_headers(struct commit_list *parents,
1278 struct commit_extra_header ***tail)
1279{
1280 while (parents) {
1281 struct commit *parent = parents->item;
1282 handle_signed_tag(parent, tail);
1283 parents = parents->next;
1284 }
1285}
1286
1287static void add_extra_header(struct strbuf *buffer,
1288 struct commit_extra_header *extra)
1289{
1290 strbuf_addstr(buffer, extra->key);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001291 if (extra->len)
1292 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1293 else
1294 strbuf_addch(buffer, '\n');
1295}
1296
Junio C Hamanoc871a1d2012-01-05 10:54:14 -08001297struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1298 const char **exclude)
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001299{
1300 struct commit_extra_header *extra = NULL;
1301 unsigned long size;
Jeff King218aa3a2014-06-13 02:32:11 -04001302 const char *buffer = get_commit_buffer(commit, &size);
1303 extra = read_commit_extra_header_lines(buffer, size, exclude);
1304 unuse_commit_buffer(commit, buffer);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001305 return extra;
1306}
1307
Christian Couder063da622014-07-07 08:35:37 +02001308void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1309{
1310 struct commit_extra_header *extra, *to_free;
1311
1312 to_free = read_commit_extra_headers(commit, NULL);
1313 for (extra = to_free; extra; extra = extra->next) {
1314 if (strcmp(extra->key, "mergetag"))
1315 continue; /* not a merge tag */
1316 fn(commit, extra, data);
1317 }
1318 free_commit_extra_headers(to_free);
1319}
1320
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001321static inline int standard_header_field(const char *field, size_t len)
1322{
René Scharfeb0725042017-02-25 20:27:40 +01001323 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1324 (len == 6 && !memcmp(field, "parent", 6)) ||
1325 (len == 6 && !memcmp(field, "author", 6)) ||
1326 (len == 9 && !memcmp(field, "committer", 9)) ||
1327 (len == 8 && !memcmp(field, "encoding", 8)));
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001328}
1329
Junio C Hamanoc871a1d2012-01-05 10:54:14 -08001330static int excluded_header_field(const char *field, size_t len, const char **exclude)
1331{
1332 if (!exclude)
1333 return 0;
1334
1335 while (*exclude) {
1336 size_t xlen = strlen(*exclude);
René Scharfeb0725042017-02-25 20:27:40 +01001337 if (len == xlen && !memcmp(field, *exclude, xlen))
Junio C Hamanoc871a1d2012-01-05 10:54:14 -08001338 return 1;
1339 exclude++;
1340 }
1341 return 0;
1342}
1343
Junio C Hamano82a75292012-09-15 13:58:15 -07001344static struct commit_extra_header *read_commit_extra_header_lines(
1345 const char *buffer, size_t size,
1346 const char **exclude)
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001347{
1348 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1349 const char *line, *next, *eof, *eob;
1350 struct strbuf buf = STRBUF_INIT;
1351
1352 for (line = buffer, eob = line + size;
1353 line < eob && *line != '\n';
1354 line = next) {
1355 next = memchr(line, '\n', eob - line);
1356 next = next ? next + 1 : eob;
1357 if (*line == ' ') {
1358 /* continuation */
1359 if (it)
1360 strbuf_add(&buf, line + 1, next - (line + 1));
1361 continue;
1362 }
1363 if (it)
1364 it->value = strbuf_detach(&buf, &it->len);
1365 strbuf_reset(&buf);
1366 it = NULL;
1367
René Scharfe50a01cc2017-02-25 20:21:52 +01001368 eof = memchr(line, ' ', next - line);
1369 if (!eof)
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001370 eof = next;
René Scharfeb0725042017-02-25 20:27:40 +01001371 else if (standard_header_field(line, eof - line) ||
1372 excluded_header_field(line, eof - line, exclude))
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001373 continue;
1374
1375 it = xcalloc(1, sizeof(*it));
1376 it->key = xmemdupz(line, eof-line);
1377 *tail = it;
1378 tail = &it->next;
1379 if (eof + 1 < next)
1380 strbuf_add(&buf, eof + 1, next - (eof + 1));
1381 }
1382 if (it)
1383 it->value = strbuf_detach(&buf, &it->len);
1384 return extra;
Junio C Hamano5231c632011-11-07 16:21:32 -08001385}
1386
1387void free_commit_extra_headers(struct commit_extra_header *extra)
1388{
1389 while (extra) {
1390 struct commit_extra_header *next = extra->next;
1391 free(extra->key);
1392 free(extra->value);
1393 free(extra);
1394 extra = next;
1395 }
1396}
1397
Jeff King3ffefb52014-06-10 17:36:52 -04001398int commit_tree(const char *msg, size_t msg_len,
1399 const unsigned char *tree,
Junio C Hamano5231c632011-11-07 16:21:32 -08001400 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001401 const char *author, const char *sign_commit)
Junio C Hamano5231c632011-11-07 16:21:32 -08001402{
1403 struct commit_extra_header *extra = NULL, **tail = &extra;
1404 int result;
1405
1406 append_merge_tag_headers(parents, &tail);
Jeff King3ffefb52014-06-10 17:36:52 -04001407 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001408 author, sign_commit, extra);
Junio C Hamano5231c632011-11-07 16:21:32 -08001409 free_commit_extra_headers(extra);
1410 return result;
1411}
1412
Linus Torvalds08a94a12012-06-28 11:24:14 -07001413static int find_invalid_utf8(const char *buf, int len)
1414{
1415 int offset = 0;
brian m. carlsone82bd6c2013-07-04 17:20:34 +00001416 static const unsigned int max_codepoint[] = {
1417 0x7f, 0x7ff, 0xffff, 0x10ffff
1418 };
Linus Torvalds08a94a12012-06-28 11:24:14 -07001419
1420 while (len) {
1421 unsigned char c = *buf++;
1422 int bytes, bad_offset;
brian m. carlson28110d42013-07-04 17:19:43 +00001423 unsigned int codepoint;
brian m. carlsone82bd6c2013-07-04 17:20:34 +00001424 unsigned int min_val, max_val;
Linus Torvalds08a94a12012-06-28 11:24:14 -07001425
1426 len--;
1427 offset++;
1428
1429 /* Simple US-ASCII? No worries. */
1430 if (c < 0x80)
1431 continue;
1432
1433 bad_offset = offset-1;
1434
1435 /*
1436 * Count how many more high bits set: that's how
1437 * many more bytes this sequence should have.
1438 */
1439 bytes = 0;
1440 while (c & 0x40) {
1441 c <<= 1;
1442 bytes++;
1443 }
1444
brian m. carlson28110d42013-07-04 17:19:43 +00001445 /*
1446 * Must be between 1 and 3 more bytes. Longer sequences result in
1447 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1448 */
1449 if (bytes < 1 || 3 < bytes)
Linus Torvalds08a94a12012-06-28 11:24:14 -07001450 return bad_offset;
1451
1452 /* Do we *have* that many bytes? */
1453 if (len < bytes)
1454 return bad_offset;
1455
brian m. carlsone82bd6c2013-07-04 17:20:34 +00001456 /*
1457 * Place the encoded bits at the bottom of the value and compute the
1458 * valid range.
1459 */
brian m. carlson28110d42013-07-04 17:19:43 +00001460 codepoint = (c & 0x7f) >> bytes;
brian m. carlsone82bd6c2013-07-04 17:20:34 +00001461 min_val = max_codepoint[bytes-1] + 1;
1462 max_val = max_codepoint[bytes];
brian m. carlson28110d42013-07-04 17:19:43 +00001463
Linus Torvalds08a94a12012-06-28 11:24:14 -07001464 offset += bytes;
1465 len -= bytes;
1466
1467 /* And verify that they are good continuation bytes */
1468 do {
brian m. carlson28110d42013-07-04 17:19:43 +00001469 codepoint <<= 6;
1470 codepoint |= *buf & 0x3f;
Linus Torvalds08a94a12012-06-28 11:24:14 -07001471 if ((*buf++ & 0xc0) != 0x80)
1472 return bad_offset;
1473 } while (--bytes);
1474
brian m. carlsone82bd6c2013-07-04 17:20:34 +00001475 /* Reject codepoints that are out of range for the sequence length. */
1476 if (codepoint < min_val || codepoint > max_val)
brian m. carlson28110d42013-07-04 17:19:43 +00001477 return bad_offset;
1478 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1479 if ((codepoint & 0x1ff800) == 0xd800)
1480 return bad_offset;
Peter Krefting81050ac2013-07-09 12:16:33 +01001481 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
Junio C Hamanodc773a62013-08-05 09:52:28 -07001482 if ((codepoint & 0xfffe) == 0xfffe)
Peter Krefting81050ac2013-07-09 12:16:33 +01001483 return bad_offset;
1484 /* So are anything in the range U+FDD0..U+FDEF. */
1485 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
brian m. carlson28110d42013-07-04 17:19:43 +00001486 return bad_offset;
Linus Torvalds08a94a12012-06-28 11:24:14 -07001487 }
1488 return -1;
1489}
1490
1491/*
1492 * This verifies that the buffer is in proper utf8 format.
1493 *
1494 * If it isn't, it assumes any non-utf8 characters are Latin1,
1495 * and does the conversion.
Linus Torvalds08a94a12012-06-28 11:24:14 -07001496 */
1497static int verify_utf8(struct strbuf *buf)
1498{
1499 int ok = 1;
1500 long pos = 0;
1501
1502 for (;;) {
1503 int bad;
1504 unsigned char c;
1505 unsigned char replace[2];
1506
1507 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1508 if (bad < 0)
1509 return ok;
1510 pos += bad;
1511 ok = 0;
1512 c = buf->buf[pos];
1513 strbuf_remove(buf, pos, 1);
1514
1515 /* We know 'c' must be in the range 128-255 */
1516 replace[0] = 0xc0 + (c >> 6);
1517 replace[1] = 0x80 + (c & 0x3f);
1518 strbuf_insert(buf, pos, replace, 2);
1519 pos += 2;
1520 }
1521}
1522
Jeff King40d52ff2010-04-01 20:05:23 -04001523static const char commit_utf8_warn[] =
Vasco Almeida4fa4b312016-09-19 13:08:16 +00001524N_("Warning: commit message did not conform to UTF-8.\n"
1525 "You may want to amend it after fixing the message, or set the config\n"
1526 "variable i18n.commitencoding to the encoding your project uses.\n");
Jeff King40d52ff2010-04-01 20:05:23 -04001527
Jeff King3ffefb52014-06-10 17:36:52 -04001528int commit_tree_extended(const char *msg, size_t msg_len,
1529 const unsigned char *tree,
Junio C Hamano5231c632011-11-07 16:21:32 -08001530 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001531 const char *author, const char *sign_commit,
1532 struct commit_extra_header *extra)
Jeff King40d52ff2010-04-01 20:05:23 -04001533{
1534 int result;
1535 int encoding_is_utf8;
1536 struct strbuf buffer;
1537
1538 assert_sha1_type(tree, OBJ_TREE);
1539
Jeff King3ffefb52014-06-10 17:36:52 -04001540 if (memchr(msg, '\0', msg_len))
Nguyễn Thái Ngọc Duy37576c12011-12-15 20:47:23 +07001541 return error("a NUL byte in commit log message not allowed.");
1542
Jeff King40d52ff2010-04-01 20:05:23 -04001543 /* Not having i18n.commitencoding is the same as having utf-8 */
1544 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1545
1546 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1547 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1548
1549 /*
1550 * NOTE! This ordering means that the same exact tree merged with a
1551 * different order of parents will be a _different_ changeset even
1552 * if everything else stays the same.
1553 */
1554 while (parents) {
René Scharfee510ab82015-10-24 18:21:31 +02001555 struct commit *parent = pop_commit(&parents);
Jeff King40d52ff2010-04-01 20:05:23 -04001556 strbuf_addf(&buffer, "parent %s\n",
brian m. carlsonf2fd0762015-11-10 02:22:28 +00001557 oid_to_hex(&parent->object.oid));
Jeff King40d52ff2010-04-01 20:05:23 -04001558 }
1559
1560 /* Person/date information */
1561 if (!author)
Jeff Kingf9bc5732012-05-24 19:28:40 -04001562 author = git_author_info(IDENT_STRICT);
Jeff King40d52ff2010-04-01 20:05:23 -04001563 strbuf_addf(&buffer, "author %s\n", author);
Jeff Kingf9bc5732012-05-24 19:28:40 -04001564 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
Jeff King40d52ff2010-04-01 20:05:23 -04001565 if (!encoding_is_utf8)
1566 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
Junio C Hamano5231c632011-11-07 16:21:32 -08001567
1568 while (extra) {
1569 add_extra_header(&buffer, extra);
1570 extra = extra->next;
1571 }
Jeff King40d52ff2010-04-01 20:05:23 -04001572 strbuf_addch(&buffer, '\n');
1573
1574 /* And add the comment */
Jeff King3ffefb52014-06-10 17:36:52 -04001575 strbuf_add(&buffer, msg, msg_len);
Jeff King40d52ff2010-04-01 20:05:23 -04001576
1577 /* And check the encoding */
Linus Torvalds08a94a12012-06-28 11:24:14 -07001578 if (encoding_is_utf8 && !verify_utf8(&buffer))
Vasco Almeida4fa4b312016-09-19 13:08:16 +00001579 fprintf(stderr, _(commit_utf8_warn));
Jeff King40d52ff2010-04-01 20:05:23 -04001580
Rene Scharfee5051462017-08-30 19:49:38 +02001581 if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
1582 result = -1;
1583 goto out;
1584 }
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001585
Jeff King40d52ff2010-04-01 20:05:23 -04001586 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
Rene Scharfee5051462017-08-30 19:49:38 +02001587out:
Jeff King40d52ff2010-04-01 20:05:23 -04001588 strbuf_release(&buffer);
1589 return result;
1590}
Junio C Hamanoae8e4c92011-11-07 13:26:22 -08001591
René Scharfebeb518c2016-08-13 14:11:27 +02001592void set_merge_remote_desc(struct commit *commit,
1593 const char *name, struct object *obj)
1594{
1595 struct merge_remote_desc *desc;
René Scharfe5447a762016-08-13 14:21:27 +02001596 FLEX_ALLOC_STR(desc, name, name);
René Scharfebeb518c2016-08-13 14:11:27 +02001597 desc->obj = obj;
René Scharfebeb518c2016-08-13 14:11:27 +02001598 commit->util = desc;
1599}
1600
Junio C Hamanoae8e4c92011-11-07 13:26:22 -08001601struct commit *get_merge_parent(const char *name)
1602{
1603 struct object *obj;
1604 struct commit *commit;
brian m. carlson7683e2e2015-03-13 23:39:34 +00001605 struct object_id oid;
brian m. carlsone82caf32017-07-13 23:49:28 +00001606 if (get_oid(name, &oid))
Junio C Hamanoae8e4c92011-11-07 13:26:22 -08001607 return NULL;
brian m. carlsonc251c832017-05-06 22:10:38 +00001608 obj = parse_object(&oid);
Junio C Hamanoae8e4c92011-11-07 13:26:22 -08001609 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
René Scharfebeb518c2016-08-13 14:11:27 +02001610 if (commit && !commit->util)
1611 set_merge_remote_desc(commit, name, obj);
Junio C Hamanoae8e4c92011-11-07 13:26:22 -08001612 return commit;
1613}
René Scharfe89b5f1d2012-04-25 22:35:27 +02001614
1615/*
1616 * Append a commit to the end of the commit_list.
1617 *
1618 * next starts by pointing to the variable that holds the head of an
1619 * empty commit_list, and is updated to point to the "next" field of
1620 * the last item on the list as new commits are appended.
1621 *
1622 * Usage example:
1623 *
1624 * struct commit_list *list;
1625 * struct commit_list **next = &list;
1626 *
1627 * next = commit_list_append(c1, next);
1628 * next = commit_list_append(c2, next);
1629 * assert(commit_list_count(list) == 2);
1630 * return list;
1631 */
1632struct commit_list **commit_list_append(struct commit *commit,
1633 struct commit_list **next)
1634{
1635 struct commit_list *new = xmalloc(sizeof(struct commit_list));
1636 new->item = commit;
1637 *next = new;
1638 new->next = NULL;
1639 return &new->next;
1640}
Nguyễn Thái Ngọc Duyefc7df42012-10-26 22:53:51 +07001641
Jeff Kingfe6eb7f2014-08-27 03:56:01 -04001642const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1643{
1644 int key_len = strlen(key);
1645 const char *line = msg;
1646
1647 while (line) {
1648 const char *eol = strchrnul(line, '\n');
1649
1650 if (line == eol)
1651 return NULL;
1652
1653 if (eol - line > key_len &&
1654 !strncmp(line, key, key_len) &&
1655 line[key_len] == ' ') {
1656 *out_len = eol - line - key_len - 1;
1657 return line + key_len + 1;
1658 }
1659 line = *eol ? eol + 1 : NULL;
1660 }
1661 return NULL;
1662}
Junio C Hamano0ed8a4e2014-12-22 12:26:23 -08001663
Christian Couder8c384582014-11-09 10:23:41 +01001664/*
Jonathan Tan710714a2016-11-02 10:29:17 -07001665 * Inspect the given string and determine the true "end" of the log message, in
Christian Couder8c384582014-11-09 10:23:41 +01001666 * order to find where to put a new Signed-off-by: line. Ignored are
Brian Malehornd76650b2017-05-15 23:06:49 -07001667 * trailing comment lines and blank lines. To support "git commit -s
1668 * --amend" on an existing commit, we also ignore "Conflicts:". To
1669 * support "git commit -v", we truncate at cut lines.
Christian Couder8c384582014-11-09 10:23:41 +01001670 *
1671 * Returns the number of bytes from the tail to ignore, to be fed as
1672 * the second parameter to append_signoff().
1673 */
Jonathan Tan710714a2016-11-02 10:29:17 -07001674int ignore_non_trailer(const char *buf, size_t len)
Christian Couder8c384582014-11-09 10:23:41 +01001675{
1676 int boc = 0;
1677 int bol = 0;
1678 int in_old_conflicts_block = 0;
Brian Malehornd76650b2017-05-15 23:06:49 -07001679 size_t cutoff = wt_status_locate_end(buf, len);
Christian Couder8c384582014-11-09 10:23:41 +01001680
Brian Malehornd76650b2017-05-15 23:06:49 -07001681 while (bol < cutoff) {
Jonathan Tan710714a2016-11-02 10:29:17 -07001682 const char *next_line = memchr(buf + bol, '\n', len - bol);
Christian Couder8c384582014-11-09 10:23:41 +01001683
Jonathan Tan710714a2016-11-02 10:29:17 -07001684 if (!next_line)
1685 next_line = buf + len;
Christian Couder8c384582014-11-09 10:23:41 +01001686 else
1687 next_line++;
1688
Jonathan Tan710714a2016-11-02 10:29:17 -07001689 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
Christian Couder8c384582014-11-09 10:23:41 +01001690 /* is this the first of the run of comments? */
1691 if (!boc)
1692 boc = bol;
1693 /* otherwise, it is just continuing */
Jonathan Tan710714a2016-11-02 10:29:17 -07001694 } else if (starts_with(buf + bol, "Conflicts:\n")) {
Christian Couder8c384582014-11-09 10:23:41 +01001695 in_old_conflicts_block = 1;
1696 if (!boc)
1697 boc = bol;
Jonathan Tan710714a2016-11-02 10:29:17 -07001698 } else if (in_old_conflicts_block && buf[bol] == '\t') {
Christian Couder8c384582014-11-09 10:23:41 +01001699 ; /* a pathname in the conflicts block */
1700 } else if (boc) {
1701 /* the previous was not trailing comment */
1702 boc = 0;
1703 in_old_conflicts_block = 0;
1704 }
Jonathan Tan710714a2016-11-02 10:29:17 -07001705 bol = next_line - buf;
Christian Couder8c384582014-11-09 10:23:41 +01001706 }
Brian Malehornd76650b2017-05-15 23:06:49 -07001707 return boc ? len - boc : len - cutoff;
Christian Couder8c384582014-11-09 10:23:41 +01001708}