@matheusbsbs / matheus-bagliano / commits / 720ba25d99

upload-pack: switch deepen-not list to an oid_array

When we see a "deepen-not" line from the client, we verify that the given name can be resolved as a ref, and then add it to a string list to be passed later to an internal "rev-list --not" traversal. We record the actual refname in the string list (so the traversal resolves it again later), but we'd be better off recording the resolved oid: 1. There's a tiny bit of wasted work in resolving it twice. 2. There's a small race condition with simultaneous updates; the later traversal may resolve to a different value (or not at all). This shouldn't cause any bad behavior (we do not care about the value in this first resolution, so whatever value rev-list gets is OK) but it could mean a confusing error message (if upload-pack fails to resolve the ref it produces a useful message, but a failing traversal later results in just "revision walk setup failed"). 3. It makes it simpler to de-duplicate the results. We don't de-dup at all right now, but we will in the next patch. >From the client's perspective the behavior should be the same. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Feb 28, 2024 at 17:37 UTC 720ba25d993423ab7b12b9bbdc62dadaa78d315e

1 file changed +7 -7

upload-pack.c

+7 -7

@@ -65,7 +65,7 @@ struct upload_pack_data {

65 struct strvec hidden_refs;

67 struct object_array shallows;

68 - struct string_list deepen_not;

68 + struct oid_array deepen_not;

69 struct object_array extra_edge_obj;

70 int depth;

71 timestamp_t deepen_since;

@@ -125,7 +125,7 @@ static void upload_pack_data_init(struct upload_pack_data *data)

125 struct object_array want_obj = OBJECT_ARRAY_INIT;

126 struct object_array have_obj = OBJECT_ARRAY_INIT;

127 struct object_array shallows = OBJECT_ARRAY_INIT;

128 - struct string_list deepen_not = STRING_LIST_INIT_DUP;

128 + struct oid_array deepen_not = OID_ARRAY_INIT;

129 struct string_list uri_protocols = STRING_LIST_INIT_DUP;

130 struct object_array extra_edge_obj = OBJECT_ARRAY_INIT;

131 struct string_list allowed_filters = STRING_LIST_INIT_DUP;

@@ -158,7 +158,7 @@ static void upload_pack_data_clear(struct upload_pack_data *data)

158 object_array_clear(&data->want_obj);

159 object_array_clear(&data->have_obj);

160 object_array_clear(&data->shallows);

161 - string_list_clear(&data->deepen_not, 0);

161 + oid_array_clear(&data->deepen_not);

162 object_array_clear(&data->extra_edge_obj);

163 list_objects_filter_release(&data->filter_options);

164 string_list_clear(&data->allowed_filters, 0);

@@ -926,8 +926,8 @@ static int send_shallow_list(struct upload_pack_data *data)

926 if (data->deepen_not.nr) {

927 strvec_push(&av, "--not");

928 for (i = 0; i < data->deepen_not.nr; i++) {

929 - struct string_list_item *s = data->deepen_not.items + i;

930 - strvec_push(&av, s->string);

929 + struct object_id *oid = data->deepen_not.oid + i;

930 + strvec_push(&av, oid_to_hex(oid));

931 }

932 strvec_push(&av, "--not");

933 }

@@ -1004,7 +1004,7 @@ static int process_deepen_since(const char *line, timestamp_t *deepen_since, int

1004 return 0;

1005 }

1006

1007 -static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)

1007 +static int process_deepen_not(const char *line, struct oid_array *deepen_not, int *deepen_rev_list)

1008 {

1009 const char *arg;

1010 if (skip_prefix(line, "deepen-not ", &arg)) {

@@ -1012,7 +1012,7 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,

1012 struct object_id oid;

1013 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)

1014 die("git upload-pack: ambiguous deepen-not: %s", line);

1015 - string_list_append(deepen_not, ref);

1015 + oid_array_append(deepen_not, &oid);

1016 free(ref);

1017 *deepen_rev_list = 1;

1018 return 1;