transport: push codepath can take arbitrary repository
The previous step added annotations with "the_repository" to various functions in the push codepath in the transport layer, but they all can take arbitrary repository pointer, and may be working on a repository that is not the_repository. Fix them. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 8, 2019 at 13:18 UTC
360c7ba3305ba66bd2f38df659b6769f25be661b
1 file changed
+10
-10
transport.c
+10
-10
@@ -1145,10 +1145,10 @@ int transport_push(struct repository *r,
1145
1146
refspec_ref_prefixes(rs, &ref_prefixes);
1147
1148
- trace2_region_enter("transport_push", "get_refs_list", the_repository);
1148
+ trace2_region_enter("transport_push", "get_refs_list", r);
1149
remote_refs = transport->vtable->get_refs_list(transport, 1,
1150
&ref_prefixes);
1151
- trace2_region_leave("transport_push", "get_refs_list", the_repository);
1151
+ trace2_region_leave("transport_push", "get_refs_list", r);
1152
1153
argv_array_clear(&ref_prefixes);
1154
@@ -1184,7 +1184,7 @@ int transport_push(struct repository *r,
1184
struct ref *ref = remote_refs;
1185
struct oid_array commits = OID_ARRAY_INIT;
1186
1187
- trace2_region_enter("transport_push", "push_submodules", the_repository);
1187
+ trace2_region_enter("transport_push", "push_submodules", r);
1188
for (; ref; ref = ref->next)
1189
if (!is_null_oid(&ref->new_oid))
1190
oid_array_append(&commits,
@@ -1197,11 +1197,11 @@ int transport_push(struct repository *r,
1197
transport->push_options,
1198
pretend)) {
1199
oid_array_clear(&commits);
1200
- trace2_region_leave("transport_push", "push_submodules", the_repository);
1200
+ trace2_region_leave("transport_push", "push_submodules", r);
1201
die(_("failed to push all needed submodules"));
1202
}
1203
oid_array_clear(&commits);
1204
- trace2_region_leave("transport_push", "push_submodules", the_repository);
1204
+ trace2_region_leave("transport_push", "push_submodules", r);
1205
}
1206
1207
if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
@@ -1212,7 +1212,7 @@ int transport_push(struct repository *r,
1212
struct string_list needs_pushing = STRING_LIST_INIT_DUP;
1213
struct oid_array commits = OID_ARRAY_INIT;
1214
1215
- trace2_region_enter("transport_push", "check_submodules", the_repository);
1215
+ trace2_region_enter("transport_push", "check_submodules", r);
1216
for (; ref; ref = ref->next)
1217
if (!is_null_oid(&ref->new_oid))
1218
oid_array_append(&commits,
@@ -1223,18 +1223,18 @@ int transport_push(struct repository *r,
1223
transport->remote->name,
1224
&needs_pushing)) {
1225
oid_array_clear(&commits);
1226
- trace2_region_leave("transport_push", "check_submodules", the_repository);
1226
+ trace2_region_leave("transport_push", "check_submodules", r);
1227
die_with_unpushed_submodules(&needs_pushing);
1228
}
1229
string_list_clear(&needs_pushing, 0);
1230
oid_array_clear(&commits);
1231
- trace2_region_leave("transport_push", "check_submodules", the_repository);
1231
+ trace2_region_leave("transport_push", "check_submodules", r);
1232
}
1233
1234
if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) {
1235
- trace2_region_enter("transport_push", "push_refs", the_repository);
1235
+ trace2_region_enter("transport_push", "push_refs", r);
1236
push_ret = transport->vtable->push_refs(transport, remote_refs, flags);
1237
- trace2_region_leave("transport_push", "push_refs", the_repository);
1237
+ trace2_region_leave("transport_push", "push_refs", r);
1238
} else
1239
push_ret = 0;
1240
err = push_had_errors(remote_refs);