blob: 9ed18eb8849b27856b8cc409921757f7f069b28b [file] [log] [blame]
Johannes Schindelined09aef2006-10-30 20:09:06 +01001#include "cache.h"
Jonathan Nieder3f5787f2018-05-15 16:42:18 -07002#include "repository.h"
Michael Haggerty6e122b42015-08-10 11:47:46 +02003#include "tempfile.h"
Michael Haggerty697cc8e2014-10-01 12:28:42 +02004#include "lockfile.h"
Stefan Bellercbd53a22018-05-15 16:42:15 -07005#include "object-store.h"
Johannes Schindelined09aef2006-10-30 20:09:06 +01006#include "commit.h"
Alexandre Julliardabef3a12006-11-11 14:57:23 +01007#include "tag.h"
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +07008#include "pkt-line.h"
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +07009#include "remote.h"
10#include "refs.h"
Jeff Kingfe299ec2020-03-30 10:03:46 -040011#include "oid-array.h"
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +070012#include "diff.h"
13#include "revision.h"
14#include "commit-slab.h"
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +070015#include "list-objects.h"
Derrick Stolee64043552018-07-20 16:33:04 +000016#include "commit-reach.h"
Taylor Blau120ad2b2020-04-30 13:48:50 -060017#include "shallow.h"
Johannes Schindelined09aef2006-10-30 20:09:06 +010018
Stefan Bellereee45022018-05-17 15:51:52 -070019void set_alternate_shallow_file(struct repository *r, const char *path, int override)
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070020{
Stefan Bellereee45022018-05-17 15:51:52 -070021 if (r->parsed_objects->is_shallow != -1)
Johannes Schindelin033abf92018-05-02 11:38:39 +020022 BUG("is_repository_shallow must not be called before set_alternate_shallow_file");
Stefan Bellereee45022018-05-17 15:51:52 -070023 if (r->parsed_objects->alternate_shallow_file && !override)
Nguyễn Thái Ngọc Duy069c0532013-12-05 20:02:45 +070024 return;
Stefan Bellereee45022018-05-17 15:51:52 -070025 free(r->parsed_objects->alternate_shallow_file);
26 r->parsed_objects->alternate_shallow_file = xstrdup_or_null(path);
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070027}
Johannes Schindelined09aef2006-10-30 20:09:06 +010028
Stefan Bellereee45022018-05-17 15:51:52 -070029int register_shallow(struct repository *r, const struct object_id *oid)
Johannes Schindelined09aef2006-10-30 20:09:06 +010030{
31 struct commit_graft *graft =
32 xmalloc(sizeof(struct commit_graft));
Stefan Bellerc1f5eb42018-06-28 18:21:59 -070033 struct commit *commit = lookup_commit(the_repository, oid);
Johannes Schindelined09aef2006-10-30 20:09:06 +010034
brian m. carlsone92b8482017-05-06 22:10:06 +000035 oidcpy(&graft->oid, oid);
Johannes Schindelined09aef2006-10-30 20:09:06 +010036 graft->nr_parent = -1;
37 if (commit && commit->object.parsed)
38 commit->parents = NULL;
Stefan Bellereee45022018-05-17 15:51:52 -070039 return register_commit_graft(r, graft, 0);
Johannes Schindelined09aef2006-10-30 20:09:06 +010040}
41
Taylor Blau120ad2b2020-04-30 13:48:50 -060042int unregister_shallow(const struct object_id *oid)
43{
Jeff King98c431b2021-01-28 01:12:35 -050044 int pos = commit_graft_pos(the_repository, oid);
Taylor Blau120ad2b2020-04-30 13:48:50 -060045 if (pos < 0)
46 return -1;
47 if (pos + 1 < the_repository->parsed_objects->grafts_nr)
48 MOVE_ARRAY(the_repository->parsed_objects->grafts + pos,
49 the_repository->parsed_objects->grafts + pos + 1,
50 the_repository->parsed_objects->grafts_nr - pos - 1);
51 the_repository->parsed_objects->grafts_nr--;
52 return 0;
53}
54
Stefan Bellereee45022018-05-17 15:51:52 -070055int is_repository_shallow(struct repository *r)
Johannes Schindelined09aef2006-10-30 20:09:06 +010056{
57 FILE *fp;
58 char buf[1024];
Stefan Bellereee45022018-05-17 15:51:52 -070059 const char *path = r->parsed_objects->alternate_shallow_file;
Johannes Schindelined09aef2006-10-30 20:09:06 +010060
Stefan Bellereee45022018-05-17 15:51:52 -070061 if (r->parsed_objects->is_shallow >= 0)
62 return r->parsed_objects->is_shallow;
Johannes Schindelined09aef2006-10-30 20:09:06 +010063
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070064 if (!path)
Stefan Bellereee45022018-05-17 15:51:52 -070065 path = git_path_shallow(r);
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070066 /*
67 * fetch-pack sets '--shallow-file ""' as an indicator that no
68 * shallow file should be used. We could just open it and it
69 * will likely fail. But let's do an explicit check instead.
70 */
Jeff King0cc77c32014-02-27 05:56:31 -050071 if (!*path || (fp = fopen(path, "r")) == NULL) {
Stefan Bellereee45022018-05-17 15:51:52 -070072 stat_validity_clear(r->parsed_objects->shallow_stat);
73 r->parsed_objects->is_shallow = 0;
74 return r->parsed_objects->is_shallow;
Johannes Schindelined09aef2006-10-30 20:09:06 +010075 }
Stefan Bellereee45022018-05-17 15:51:52 -070076 stat_validity_update(r->parsed_objects->shallow_stat, fileno(fp));
77 r->parsed_objects->is_shallow = 1;
Johannes Schindelined09aef2006-10-30 20:09:06 +010078
79 while (fgets(buf, sizeof(buf), fp)) {
brian m. carlsone92b8482017-05-06 22:10:06 +000080 struct object_id oid;
81 if (get_oid_hex(buf, &oid))
Johannes Schindelined09aef2006-10-30 20:09:06 +010082 die("bad shallow line: %s", buf);
Stefan Bellereee45022018-05-17 15:51:52 -070083 register_shallow(r, &oid);
Johannes Schindelined09aef2006-10-30 20:09:06 +010084 }
85 fclose(fp);
Stefan Bellereee45022018-05-17 15:51:52 -070086 return r->parsed_objects->is_shallow;
Johannes Schindelined09aef2006-10-30 20:09:06 +010087}
88
Taylor Blau37b9dca2020-04-22 18:25:45 -060089static void reset_repository_shallow(struct repository *r)
90{
91 r->parsed_objects->is_shallow = -1;
92 stat_validity_clear(r->parsed_objects->shallow_stat);
93}
94
Taylor Blaucac4b8e2020-04-30 13:48:57 -060095int commit_shallow_file(struct repository *r, struct shallow_lock *lk)
Taylor Blau37b9dca2020-04-22 18:25:45 -060096{
Taylor Blaucac4b8e2020-04-30 13:48:57 -060097 int res = commit_lock_file(&lk->lock);
Taylor Blau37b9dca2020-04-22 18:25:45 -060098 reset_repository_shallow(r);
99 return res;
100}
101
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600102void rollback_shallow_file(struct repository *r, struct shallow_lock *lk)
Taylor Blau37b9dca2020-04-22 18:25:45 -0600103{
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600104 rollback_lock_file(&lk->lock);
Taylor Blau37b9dca2020-04-22 18:25:45 -0600105 reset_repository_shallow(r);
106}
107
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200108/*
109 * TODO: use "int" elemtype instead of "int *" when/if commit-slab
110 * supports a "valid" flag.
111 */
112define_commit_slab(commit_depth, int *);
SZEDER Gábor1df15f82020-06-05 13:00:26 +0000113static void free_depth_in_slab(int **ptr)
114{
115 FREE_AND_NULL(*ptr);
116}
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100117struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
118 int shallow_flag, int not_shallow_flag)
Johannes Schindelined09aef2006-10-30 20:09:06 +0100119{
120 int i = 0, cur_depth = 0;
121 struct commit_list *result = NULL;
Thiago Farina3cd47452010-08-28 23:04:17 -0300122 struct object_array stack = OBJECT_ARRAY_INIT;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100123 struct commit *commit = NULL;
Nguyễn Thái Ngọc Duy79d3a232013-12-05 20:02:41 +0700124 struct commit_graft *graft;
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200125 struct commit_depth depths;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100126
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200127 init_commit_depth(&depths);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100128 while (commit || i < heads->nr || stack.nr) {
129 struct commit_list *p;
130 if (!commit) {
131 if (i < heads->nr) {
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200132 int **depth_slot;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100133 commit = (struct commit *)
Stefan Bellera74093d2018-06-28 18:22:05 -0700134 deref_tag(the_repository,
135 heads->objects[i++].item,
136 NULL, 0);
Martin Koegleraffeef12008-02-18 08:31:54 +0100137 if (!commit || commit->object.type != OBJ_COMMIT) {
Johannes Schindelined09aef2006-10-30 20:09:06 +0100138 commit = NULL;
139 continue;
140 }
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200141 depth_slot = commit_depth_at(&depths, commit);
142 if (!*depth_slot)
143 *depth_slot = xmalloc(sizeof(int));
144 **depth_slot = 0;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100145 cur_depth = 0;
146 } else {
147 commit = (struct commit *)
Martin Ågren71992032017-09-23 01:34:53 +0200148 object_array_pop(&stack);
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200149 cur_depth = **commit_depth_at(&depths, commit);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100150 }
151 }
Jeff King367068e2013-10-24 04:54:01 -0400152 parse_commit_or_die(commit);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100153 cur_depth++;
Nguyễn Thái Ngọc Duy79d3a232013-12-05 20:02:41 +0700154 if ((depth != INFINITE_DEPTH && cur_depth >= depth) ||
Stefan Bellerc8813482018-05-17 15:51:46 -0700155 (is_repository_shallow(the_repository) && !commit->parents &&
Jonathan Nieder1f93ecd2018-05-17 15:51:42 -0700156 (graft = lookup_commit_graft(the_repository, &commit->object.oid)) != NULL &&
Nguyễn Thái Ngọc Duy79d3a232013-12-05 20:02:41 +0700157 graft->nr_parent < 0)) {
Nguyễn Thái Ngọc Duy682c7d22013-01-11 16:05:47 +0700158 commit_list_insert(commit, &result);
159 commit->object.flags |= shallow_flag;
160 commit = NULL;
161 continue;
162 }
163 commit->object.flags |= not_shallow_flag;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100164 for (p = commit->parents, commit = NULL; p; p = p->next) {
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200165 int **depth_slot = commit_depth_at(&depths, p->item);
166 if (!*depth_slot) {
167 *depth_slot = xmalloc(sizeof(int));
168 **depth_slot = cur_depth;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100169 } else {
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200170 if (cur_depth >= **depth_slot)
Johannes Schindelined09aef2006-10-30 20:09:06 +0100171 continue;
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200172 **depth_slot = cur_depth;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100173 }
Matthijs Kooijman4b796952013-07-11 13:25:52 +0200174 if (p->next)
175 add_object_array(&p->item->object,
176 NULL, &stack);
177 else {
178 commit = p->item;
Nguyễn Thái Ngọc Duy58dbe582018-05-19 07:28:21 +0200179 cur_depth = **commit_depth_at(&depths, commit);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100180 }
Johannes Schindelined09aef2006-10-30 20:09:06 +0100181 }
182 }
SZEDER Gábor1df15f82020-06-05 13:00:26 +0000183 deep_clear_commit_depth(&depths, free_depth_in_slab);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100184
185 return result;
186}
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700187
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700188static void show_commit(struct commit *commit, void *data)
189{
190 commit_list_insert(commit, data);
191}
192
193/*
194 * Given rev-list arguments, run rev-list. All reachable commits
195 * except border ones are marked with not_shallow_flag. Border commits
196 * are marked with shallow_flag. The list of border/shallow commits
197 * are also returned.
198 */
199struct commit_list *get_shallow_commits_by_rev_list(int ac, const char **av,
200 int shallow_flag,
201 int not_shallow_flag)
202{
203 struct commit_list *result = NULL, *p;
204 struct commit_list *not_shallow_list = NULL;
205 struct rev_info revs;
206 int both_flags = shallow_flag | not_shallow_flag;
207
208 /*
209 * SHALLOW (excluded) and NOT_SHALLOW (included) should not be
210 * set at this point. But better be safe than sorry.
211 */
212 clear_object_flags(both_flags);
213
Stefan Bellerc8813482018-05-17 15:51:46 -0700214 is_repository_shallow(the_repository); /* make sure shallows are read */
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700215
Nguyễn Thái Ngọc Duy2abf3502018-09-21 17:57:38 +0200216 repo_init_revisions(the_repository, &revs, NULL);
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700217 save_commit_buffer = 0;
218 setup_revisions(ac, av, &revs, NULL);
219
220 if (prepare_revision_walk(&revs))
221 die("revision walk setup failed");
222 traverse_commit_list(&revs, show_commit, NULL, &not_shallow_list);
223
Nguyễn Thái Ngọc Duye34de732018-05-26 13:35:18 +0200224 if (!not_shallow_list)
225 die("no commits selected for shallow requests");
226
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700227 /* Mark all reachable commits as NOT_SHALLOW */
228 for (p = not_shallow_list; p; p = p->next)
229 p->item->object.flags |= not_shallow_flag;
230
231 /*
232 * mark border commits SHALLOW + NOT_SHALLOW.
233 * We cannot clear NOT_SHALLOW right now. Imagine border
234 * commit A is processed first, then commit B, whose parent is
235 * A, later. If NOT_SHALLOW on A is cleared at step 1, B
236 * itself is considered border at step 2, which is incorrect.
237 */
238 for (p = not_shallow_list; p; p = p->next) {
239 struct commit *c = p->item;
240 struct commit_list *parent;
241
242 if (parse_commit(c))
243 die("unable to parse commit %s",
244 oid_to_hex(&c->object.oid));
245
246 for (parent = c->parents; parent; parent = parent->next)
247 if (!(parent->item->object.flags & not_shallow_flag)) {
248 c->object.flags |= shallow_flag;
249 commit_list_insert(c, &result);
250 break;
251 }
252 }
253 free_commit_list(not_shallow_list);
254
255 /*
256 * Now we can clean up NOT_SHALLOW on border commits. Having
257 * both flags set can confuse the caller.
258 */
259 for (p = result; p; p = p->next) {
260 struct object *o = &p->item->object;
261 if ((o->flags & both_flags) == both_flags)
262 o->flags &= ~not_shallow_flag;
263 }
264 return result;
265}
266
Stefan Bellereee45022018-05-17 15:51:52 -0700267static void check_shallow_file_for_update(struct repository *r)
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700268{
Stefan Bellereee45022018-05-17 15:51:52 -0700269 if (r->parsed_objects->is_shallow == -1)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200270 BUG("shallow must be initialized by now");
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700271
Nguyễn Thái Ngọc Duy34e77712019-06-27 16:28:52 +0700272 if (!stat_validity_check(r->parsed_objects->shallow_stat,
273 git_path_shallow(r)))
Jeff King0cc77c32014-02-27 05:56:31 -0500274 die("shallow file has changed since we read it");
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700275}
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700276
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700277#define SEEN_ONLY 1
278#define VERBOSE 2
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700279#define QUICK 4
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700280
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700281struct write_shallow_data {
282 struct strbuf *out;
283 int use_pack_protocol;
284 int count;
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700285 unsigned flags;
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700286};
287
288static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
289{
290 struct write_shallow_data *data = cb_data;
brian m. carlson7683e2e2015-03-13 23:39:34 +0000291 const char *hex = oid_to_hex(&graft->oid);
Nguyễn Thái Ngọc Duy6a3bbb42013-08-16 16:52:03 +0700292 if (graft->nr_parent != -1)
293 return 0;
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700294 if (data->flags & QUICK) {
295 if (!has_object_file(&graft->oid))
296 return 0;
297 } else if (data->flags & SEEN_ONLY) {
Stefan Bellerc1f5eb42018-06-28 18:21:59 -0700298 struct commit *c = lookup_commit(the_repository, &graft->oid);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700299 if (!c || !(c->object.flags & SEEN)) {
300 if (data->flags & VERBOSE)
301 printf("Removing %s from .git/shallow\n",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000302 oid_to_hex(&c->object.oid));
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700303 return 0;
304 }
305 }
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700306 data->count++;
307 if (data->use_pack_protocol)
308 packet_buf_write(data->out, "shallow %s", hex);
309 else {
310 strbuf_addstr(data->out, hex);
311 strbuf_addch(data->out, '\n');
312 }
313 return 0;
314}
315
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700316static int write_shallow_commits_1(struct strbuf *out, int use_pack_protocol,
brian m. carlson910650d2017-03-31 01:40:00 +0000317 const struct oid_array *extra,
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700318 unsigned flags)
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700319{
320 struct write_shallow_data data;
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700321 int i;
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700322 data.out = out;
323 data.use_pack_protocol = use_pack_protocol;
324 data.count = 0;
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700325 data.flags = flags;
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700326 for_each_commit_graft(write_one_shallow, &data);
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700327 if (!extra)
328 return data.count;
329 for (i = 0; i < extra->nr; i++) {
brian m. carlsonee3051b2017-03-26 16:01:37 +0000330 strbuf_addstr(out, oid_to_hex(extra->oid + i));
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700331 strbuf_addch(out, '\n');
332 data.count++;
333 }
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700334 return data.count;
335}
336
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700337int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
brian m. carlson910650d2017-03-31 01:40:00 +0000338 const struct oid_array *extra)
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700339{
340 return write_shallow_commits_1(out, use_pack_protocol, extra, 0);
341}
342
brian m. carlson910650d2017-03-31 01:40:00 +0000343const char *setup_temporary_shallow(const struct oid_array *extra)
Jeff King0179c942014-02-27 06:25:20 -0500344{
Jeff King076aa2c2017-09-05 08:15:08 -0400345 struct tempfile *temp;
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700346 struct strbuf sb = STRBUF_INIT;
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700347
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700348 if (write_shallow_commits(&sb, 0, extra)) {
Jeff King076aa2c2017-09-05 08:15:08 -0400349 temp = xmks_tempfile(git_path("shallow_XXXXXX"));
Jeff King0179c942014-02-27 06:25:20 -0500350
Junio C Hamanoc50424a2017-09-25 15:24:06 +0900351 if (write_in_full(temp->fd, sb.buf, sb.len) < 0 ||
Jeff King076aa2c2017-09-05 08:15:08 -0400352 close_tempfile_gently(temp) < 0)
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700353 die_errno("failed to write to %s",
Jeff King076aa2c2017-09-05 08:15:08 -0400354 get_tempfile_path(temp));
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700355 strbuf_release(&sb);
Jeff King076aa2c2017-09-05 08:15:08 -0400356 return get_tempfile_path(temp);
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700357 }
358 /*
359 * is_repository_shallow() sees empty string as "no shallow
360 * file".
361 */
Jeff King08990132017-09-05 08:14:16 -0400362 return "";
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700363}
364
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600365void setup_alternate_shallow(struct shallow_lock *shallow_lock,
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700366 const char **alternate_shallow_file,
brian m. carlson910650d2017-03-31 01:40:00 +0000367 const struct oid_array *extra)
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700368{
369 struct strbuf sb = STRBUF_INIT;
370 int fd;
371
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600372 fd = hold_lock_file_for_update(&shallow_lock->lock,
Stefan Beller102de882018-05-17 15:51:51 -0700373 git_path_shallow(the_repository),
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700374 LOCK_DIE_ON_ERROR);
Stefan Beller22bdc7c2018-05-17 15:51:45 -0700375 check_shallow_file_for_update(the_repository);
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700376 if (write_shallow_commits(&sb, 0, extra)) {
Jeff King06f46f22017-09-13 13:16:03 -0400377 if (write_in_full(fd, sb.buf, sb.len) < 0)
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700378 die_errno("failed to write to %s",
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600379 get_lock_file_path(&shallow_lock->lock));
380 *alternate_shallow_file = get_lock_file_path(&shallow_lock->lock);
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700381 } else
382 /*
383 * is_repository_shallow() sees empty string as "no
384 * shallow file".
385 */
386 *alternate_shallow_file = "";
387 strbuf_release(&sb);
388}
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700389
390static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
391{
392 int fd = *(int *)cb;
393 if (graft->nr_parent == -1)
Lars Schneider81c634e2016-10-16 16:20:29 -0700394 packet_write_fmt(fd, "shallow %s\n", oid_to_hex(&graft->oid));
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700395 return 0;
396}
397
398void advertise_shallow_grafts(int fd)
399{
Stefan Bellerc8813482018-05-17 15:51:46 -0700400 if (!is_repository_shallow(the_repository))
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700401 return;
402 for_each_commit_graft(advertise_shallow_grafts_cb, &fd);
403}
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700404
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700405/*
406 * mark_reachable_objects() should have been run prior to this and all
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700407 * reachable commits marked as "SEEN", except when quick_prune is non-zero,
408 * in which case lines are excised from the shallow file if they refer to
409 * commits that do not exist (any longer).
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700410 */
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700411void prune_shallow(unsigned options)
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700412{
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600413 struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT;
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700414 struct strbuf sb = STRBUF_INIT;
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700415 unsigned flags = SEEN_ONLY;
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700416 int fd;
417
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700418 if (options & PRUNE_QUICK)
419 flags |= QUICK;
420
421 if (options & PRUNE_SHOW_ONLY) {
422 flags |= VERBOSE;
423 write_shallow_commits_1(&sb, 0, NULL, flags);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700424 strbuf_release(&sb);
425 return;
426 }
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600427 fd = hold_lock_file_for_update(&shallow_lock.lock,
Stefan Beller102de882018-05-17 15:51:51 -0700428 git_path_shallow(the_repository),
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700429 LOCK_DIE_ON_ERROR);
Stefan Beller22bdc7c2018-05-17 15:51:45 -0700430 check_shallow_file_for_update(the_repository);
Johannes Schindelin2588f6e2018-10-24 08:56:12 -0700431 if (write_shallow_commits_1(&sb, 0, NULL, flags)) {
Jeff King06f46f22017-09-13 13:16:03 -0400432 if (write_in_full(fd, sb.buf, sb.len) < 0)
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700433 die_errno("failed to write to %s",
Taylor Blaucac4b8e2020-04-30 13:48:57 -0600434 get_lock_file_path(&shallow_lock.lock));
Taylor Blau37b9dca2020-04-22 18:25:45 -0600435 commit_shallow_file(the_repository, &shallow_lock);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700436 } else {
Stefan Beller102de882018-05-17 15:51:51 -0700437 unlink(git_path_shallow(the_repository));
Taylor Blau37b9dca2020-04-22 18:25:45 -0600438 rollback_shallow_file(the_repository, &shallow_lock);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700439 }
440 strbuf_release(&sb);
441}
442
Karsten Blees6aa30852014-07-12 02:00:06 +0200443struct trace_key trace_shallow = TRACE_KEY_INIT(SHALLOW);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700444
445/*
446 * Step 1, split sender shallow commits into "ours" and "theirs"
447 * Step 2, clean "ours" based on .git/shallow
448 */
brian m. carlson910650d2017-03-31 01:40:00 +0000449void prepare_shallow_info(struct shallow_info *info, struct oid_array *sa)
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700450{
451 int i;
Karsten Blees6aa30852014-07-12 02:00:06 +0200452 trace_printf_key(&trace_shallow, "shallow: prepare_shallow_info\n");
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700453 memset(info, 0, sizeof(*info));
454 info->shallow = sa;
455 if (!sa)
456 return;
Jeff Kingb32fa952016-02-22 17:44:25 -0500457 ALLOC_ARRAY(info->ours, sa->nr);
458 ALLOC_ARRAY(info->theirs, sa->nr);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700459 for (i = 0; i < sa->nr; i++) {
brian m. carlsonee3051b2017-03-26 16:01:37 +0000460 if (has_object_file(sa->oid + i)) {
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700461 struct commit_graft *graft;
Jonathan Nieder1f93ecd2018-05-17 15:51:42 -0700462 graft = lookup_commit_graft(the_repository,
463 &sa->oid[i]);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700464 if (graft && graft->nr_parent < 0)
465 continue;
466 info->ours[info->nr_ours++] = i;
467 } else
468 info->theirs[info->nr_theirs++] = i;
469 }
470}
471
472void clear_shallow_info(struct shallow_info *info)
473{
474 free(info->ours);
475 free(info->theirs);
476}
477
478/* Step 4, remove non-existent ones in "theirs" after getting the pack */
479
480void remove_nonexistent_theirs_shallow(struct shallow_info *info)
481{
brian m. carlsonee3051b2017-03-26 16:01:37 +0000482 struct object_id *oid = info->shallow->oid;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700483 int i, dst;
Karsten Blees6aa30852014-07-12 02:00:06 +0200484 trace_printf_key(&trace_shallow, "shallow: remove_nonexistent_theirs_shallow\n");
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700485 for (i = dst = 0; i < info->nr_theirs; i++) {
486 if (i != dst)
487 info->theirs[dst] = info->theirs[i];
brian m. carlsonee3051b2017-03-26 16:01:37 +0000488 if (has_object_file(oid + info->theirs[i]))
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700489 dst++;
490 }
491 info->nr_theirs = dst;
492}
493
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700494define_commit_slab(ref_bitmap, uint32_t *);
495
Nguyễn Thái Ngọc Duy6bc3d8c2016-12-06 19:53:35 +0700496#define POOL_SIZE (512 * 1024)
497
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700498struct paint_info {
499 struct ref_bitmap ref_bitmap;
500 unsigned nr_bits;
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700501 char **pools;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700502 char *free, *end;
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700503 unsigned pool_count;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700504};
505
506static uint32_t *paint_alloc(struct paint_info *info)
507{
René Scharfe42c78a22017-07-08 12:35:35 +0200508 unsigned nr = DIV_ROUND_UP(info->nr_bits, 32);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700509 unsigned size = nr * sizeof(uint32_t);
510 void *p;
Rasmus Villemoes381aa8e2016-12-06 19:53:37 +0700511 if (!info->pool_count || size > info->end - info->free) {
Nguyễn Thái Ngọc Duyf2386c62016-12-06 19:53:36 +0700512 if (size > POOL_SIZE)
Johannes Schindelin033abf92018-05-02 11:38:39 +0200513 BUG("pool size too small for %d in paint_alloc()",
Nguyễn Thái Ngọc Duyf2386c62016-12-06 19:53:36 +0700514 size);
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700515 info->pool_count++;
516 REALLOC_ARRAY(info->pools, info->pool_count);
Nguyễn Thái Ngọc Duy6bc3d8c2016-12-06 19:53:35 +0700517 info->free = xmalloc(POOL_SIZE);
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700518 info->pools[info->pool_count - 1] = info->free;
Nguyễn Thái Ngọc Duy6bc3d8c2016-12-06 19:53:35 +0700519 info->end = info->free + POOL_SIZE;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700520 }
521 p = info->free;
522 info->free += size;
523 return p;
524}
525
526/*
527 * Given a commit SHA-1, walk down to parents until either SEEN,
528 * UNINTERESTING or BOTTOM is hit. Set the id-th bit in ref_bitmap for
529 * all walked commits.
530 */
brian m. carlson1e43ed92017-05-06 22:10:09 +0000531static void paint_down(struct paint_info *info, const struct object_id *oid,
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700532 unsigned int id)
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700533{
534 unsigned int i, nr;
535 struct commit_list *head = NULL;
René Scharfe42c78a22017-07-08 12:35:35 +0200536 int bitmap_nr = DIV_ROUND_UP(info->nr_bits, 32);
René Scharfe50492f72016-07-30 20:18:31 +0200537 size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr);
Stefan Beller21e1ee82018-06-28 18:21:57 -0700538 struct commit *c = lookup_commit_reference_gently(the_repository, oid,
539 1);
Johannes Schindelin7c565a62017-05-04 15:58:35 +0200540 uint32_t *tmp; /* to be freed before return */
541 uint32_t *bitmap;
542
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700543 if (!c)
544 return;
Johannes Schindelin7c565a62017-05-04 15:58:35 +0200545
546 tmp = xmalloc(bitmap_size);
547 bitmap = paint_alloc(info);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700548 memset(bitmap, 0, bitmap_size);
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700549 bitmap[id / 32] |= (1U << (id % 32));
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700550 commit_list_insert(c, &head);
551 while (head) {
552 struct commit_list *p;
René Scharfee510ab82015-10-24 18:21:31 +0200553 struct commit *c = pop_commit(&head);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700554 uint32_t **refs = ref_bitmap_at(&info->ref_bitmap, c);
555
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700556 /* XXX check "UNINTERESTING" from pack bitmaps if available */
557 if (c->object.flags & (SEEN | UNINTERESTING))
558 continue;
559 else
560 c->object.flags |= SEEN;
561
562 if (*refs == NULL)
563 *refs = bitmap;
564 else {
565 memcpy(tmp, *refs, bitmap_size);
566 for (i = 0; i < bitmap_nr; i++)
567 tmp[i] |= bitmap[i];
568 if (memcmp(tmp, *refs, bitmap_size)) {
569 *refs = paint_alloc(info);
570 memcpy(*refs, tmp, bitmap_size);
571 }
572 }
573
574 if (c->object.flags & BOTTOM)
575 continue;
576
577 if (parse_commit(c))
578 die("unable to parse commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000579 oid_to_hex(&c->object.oid));
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700580
581 for (p = c->parents; p; p = p->next) {
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700582 if (p->item->object.flags & SEEN)
583 continue;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700584 commit_list_insert(p->item, &head);
585 }
586 }
587
588 nr = get_max_object_index();
589 for (i = 0; i < nr; i++) {
590 struct object *o = get_indexed_object(i);
591 if (o && o->type == OBJ_COMMIT)
592 o->flags &= ~SEEN;
593 }
594
595 free(tmp);
596}
597
Michael Haggerty580b04e2015-05-25 18:39:06 +0000598static int mark_uninteresting(const char *refname, const struct object_id *oid,
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700599 int flags, void *cb_data)
600{
Stefan Beller21e1ee82018-06-28 18:21:57 -0700601 struct commit *commit = lookup_commit_reference_gently(the_repository,
602 oid, 1);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700603 if (!commit)
604 return 0;
605 commit->object.flags |= UNINTERESTING;
606 mark_parents_uninteresting(commit);
607 return 0;
608}
609
610static void post_assign_shallow(struct shallow_info *info,
611 struct ref_bitmap *ref_bitmap,
612 int *ref_status);
613/*
614 * Step 6(+7), associate shallow commits with new refs
615 *
616 * info->ref must be initialized before calling this function.
617 *
618 * If used is not NULL, it's an array of info->shallow->nr
619 * bitmaps. The n-th bit set in the m-th bitmap if ref[n] needs the
620 * m-th shallow commit from info->shallow.
621 *
622 * If used is NULL, "ours" and "theirs" are updated. And if ref_status
623 * is not NULL it's an array of ref->nr ints. ref_status[i] is true if
624 * the ref needs some shallow commits from either info->ours or
625 * info->theirs.
626 */
627void assign_shallow_commits_to_refs(struct shallow_info *info,
628 uint32_t **used, int *ref_status)
629{
brian m. carlsonee3051b2017-03-26 16:01:37 +0000630 struct object_id *oid = info->shallow->oid;
brian m. carlson910650d2017-03-31 01:40:00 +0000631 struct oid_array *ref = info->ref;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700632 unsigned int i, nr;
633 int *shallow, nr_shallow = 0;
634 struct paint_info pi;
635
Karsten Blees6aa30852014-07-12 02:00:06 +0200636 trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n");
Jeff Kingb32fa952016-02-22 17:44:25 -0500637 ALLOC_ARRAY(shallow, info->nr_ours + info->nr_theirs);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700638 for (i = 0; i < info->nr_ours; i++)
639 shallow[nr_shallow++] = info->ours[i];
640 for (i = 0; i < info->nr_theirs; i++)
641 shallow[nr_shallow++] = info->theirs[i];
642
643 /*
644 * Prepare the commit graph to track what refs can reach what
645 * (new) shallow commits.
646 */
647 nr = get_max_object_index();
648 for (i = 0; i < nr; i++) {
649 struct object *o = get_indexed_object(i);
650 if (!o || o->type != OBJ_COMMIT)
651 continue;
652
653 o->flags &= ~(UNINTERESTING | BOTTOM | SEEN);
654 }
655
656 memset(&pi, 0, sizeof(pi));
657 init_ref_bitmap(&pi.ref_bitmap);
658 pi.nr_bits = ref->nr;
659
660 /*
661 * "--not --all" to cut short the traversal if new refs
662 * connect to old refs. If not (e.g. force ref updates) it'll
663 * have to go down to the current shallow commits.
664 */
Michael Haggerty580b04e2015-05-25 18:39:06 +0000665 head_ref(mark_uninteresting, NULL);
666 for_each_ref(mark_uninteresting, NULL);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700667
668 /* Mark potential bottoms so we won't go out of bound */
669 for (i = 0; i < nr_shallow; i++) {
Stefan Bellerc1f5eb42018-06-28 18:21:59 -0700670 struct commit *c = lookup_commit(the_repository,
671 &oid[shallow[i]]);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700672 c->object.flags |= BOTTOM;
673 }
674
675 for (i = 0; i < ref->nr; i++)
brian m. carlson1e43ed92017-05-06 22:10:09 +0000676 paint_down(&pi, ref->oid + i, i);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700677
678 if (used) {
René Scharfe42c78a22017-07-08 12:35:35 +0200679 int bitmap_size = DIV_ROUND_UP(pi.nr_bits, 32) * sizeof(uint32_t);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700680 memset(used, 0, sizeof(*used) * info->shallow->nr);
681 for (i = 0; i < nr_shallow; i++) {
Stefan Bellerc1f5eb42018-06-28 18:21:59 -0700682 const struct commit *c = lookup_commit(the_repository,
683 &oid[shallow[i]]);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700684 uint32_t **map = ref_bitmap_at(&pi.ref_bitmap, c);
685 if (*map)
686 used[shallow[i]] = xmemdupz(*map, bitmap_size);
687 }
688 /*
689 * unreachable shallow commits are not removed from
690 * "ours" and "theirs". The user is supposed to run
691 * step 7 on every ref separately and not trust "ours"
692 * and "theirs" any more.
693 */
694 } else
695 post_assign_shallow(info, &pi.ref_bitmap, ref_status);
696
697 clear_ref_bitmap(&pi.ref_bitmap);
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700698 for (i = 0; i < pi.pool_count; i++)
699 free(pi.pools[i]);
700 free(pi.pools);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700701 free(shallow);
702}
703
704struct commit_array {
705 struct commit **commits;
706 int nr, alloc;
707};
708
Michael Haggerty580b04e2015-05-25 18:39:06 +0000709static int add_ref(const char *refname, const struct object_id *oid,
710 int flags, void *cb_data)
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700711{
712 struct commit_array *ca = cb_data;
713 ALLOC_GROW(ca->commits, ca->nr + 1, ca->alloc);
Stefan Beller21e1ee82018-06-28 18:21:57 -0700714 ca->commits[ca->nr] = lookup_commit_reference_gently(the_repository,
715 oid, 1);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700716 if (ca->commits[ca->nr])
717 ca->nr++;
718 return 0;
719}
720
721static void update_refstatus(int *ref_status, int nr, uint32_t *bitmap)
722{
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700723 unsigned int i;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700724 if (!ref_status)
725 return;
726 for (i = 0; i < nr; i++)
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700727 if (bitmap[i / 32] & (1U << (i % 32)))
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700728 ref_status[i]++;
729}
730
731/*
732 * Step 7, reachability test on "ours" at commit level
733 */
734static void post_assign_shallow(struct shallow_info *info,
735 struct ref_bitmap *ref_bitmap,
736 int *ref_status)
737{
brian m. carlsonee3051b2017-03-26 16:01:37 +0000738 struct object_id *oid = info->shallow->oid;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700739 struct commit *c;
740 uint32_t **bitmap;
741 int dst, i, j;
René Scharfe42c78a22017-07-08 12:35:35 +0200742 int bitmap_nr = DIV_ROUND_UP(info->ref->nr, 32);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700743 struct commit_array ca;
744
Karsten Blees6aa30852014-07-12 02:00:06 +0200745 trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n");
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700746 if (ref_status)
747 memset(ref_status, 0, sizeof(*ref_status) * info->ref->nr);
748
749 /* Remove unreachable shallow commits from "theirs" */
750 for (i = dst = 0; i < info->nr_theirs; i++) {
751 if (i != dst)
752 info->theirs[dst] = info->theirs[i];
Stefan Bellerc1f5eb42018-06-28 18:21:59 -0700753 c = lookup_commit(the_repository, &oid[info->theirs[i]]);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700754 bitmap = ref_bitmap_at(ref_bitmap, c);
755 if (!*bitmap)
756 continue;
757 for (j = 0; j < bitmap_nr; j++)
758 if (bitmap[0][j]) {
759 update_refstatus(ref_status, info->ref->nr, *bitmap);
760 dst++;
761 break;
762 }
763 }
764 info->nr_theirs = dst;
765
766 memset(&ca, 0, sizeof(ca));
Michael Haggerty580b04e2015-05-25 18:39:06 +0000767 head_ref(add_ref, &ca);
768 for_each_ref(add_ref, &ca);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700769
770 /* Remove unreachable shallow commits from "ours" */
771 for (i = dst = 0; i < info->nr_ours; i++) {
772 if (i != dst)
773 info->ours[dst] = info->ours[i];
Stefan Bellerc1f5eb42018-06-28 18:21:59 -0700774 c = lookup_commit(the_repository, &oid[info->ours[i]]);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700775 bitmap = ref_bitmap_at(ref_bitmap, c);
776 if (!*bitmap)
777 continue;
778 for (j = 0; j < bitmap_nr; j++)
779 if (bitmap[0][j] &&
780 /* Step 7, reachability test at commit level */
781 !in_merge_bases_many(c, ca.nr, ca.commits)) {
782 update_refstatus(ref_status, info->ref->nr, *bitmap);
783 dst++;
784 break;
785 }
786 }
787 info->nr_ours = dst;
788
789 free(ca.commits);
790}
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700791
792/* (Delayed) step 7, reachability test at commit level */
793int delayed_reachability_test(struct shallow_info *si, int c)
794{
795 if (si->need_reachability_test[c]) {
Stefan Bellerc1f5eb42018-06-28 18:21:59 -0700796 struct commit *commit = lookup_commit(the_repository,
797 &si->shallow->oid[c]);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700798
799 if (!si->commits) {
800 struct commit_array ca;
Michael Haggerty2b2a5be2015-05-25 18:38:28 +0000801
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700802 memset(&ca, 0, sizeof(ca));
Michael Haggerty580b04e2015-05-25 18:39:06 +0000803 head_ref(add_ref, &ca);
804 for_each_ref(add_ref, &ca);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700805 si->commits = ca.commits;
806 si->nr_commits = ca.nr;
807 }
808
809 si->reachable[c] = in_merge_bases_many(commit,
810 si->nr_commits,
811 si->commits);
812 si->need_reachability_test[c] = 0;
813 }
814 return si->reachable[c];
815}