Skip to content

Commit 360c7ba

Browse files
committed
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 25e4b80 commit 360c7ba

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

transport.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,10 +1145,10 @@ int transport_push(struct repository *r,
11451145

11461146
refspec_ref_prefixes(rs, &ref_prefixes);
11471147

1148-
trace2_region_enter("transport_push", "get_refs_list", the_repository);
1148+
trace2_region_enter("transport_push", "get_refs_list", r);
11491149
remote_refs = transport->vtable->get_refs_list(transport, 1,
11501150
&ref_prefixes);
1151-
trace2_region_leave("transport_push", "get_refs_list", the_repository);
1151+
trace2_region_leave("transport_push", "get_refs_list", r);
11521152

11531153
argv_array_clear(&ref_prefixes);
11541154

@@ -1184,7 +1184,7 @@ int transport_push(struct repository *r,
11841184
struct ref *ref = remote_refs;
11851185
struct oid_array commits = OID_ARRAY_INIT;
11861186

1187-
trace2_region_enter("transport_push", "push_submodules", the_repository);
1187+
trace2_region_enter("transport_push", "push_submodules", r);
11881188
for (; ref; ref = ref->next)
11891189
if (!is_null_oid(&ref->new_oid))
11901190
oid_array_append(&commits,
@@ -1197,11 +1197,11 @@ int transport_push(struct repository *r,
11971197
transport->push_options,
11981198
pretend)) {
11991199
oid_array_clear(&commits);
1200-
trace2_region_leave("transport_push", "push_submodules", the_repository);
1200+
trace2_region_leave("transport_push", "push_submodules", r);
12011201
die(_("failed to push all needed submodules"));
12021202
}
12031203
oid_array_clear(&commits);
1204-
trace2_region_leave("transport_push", "push_submodules", the_repository);
1204+
trace2_region_leave("transport_push", "push_submodules", r);
12051205
}
12061206

12071207
if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
@@ -1212,7 +1212,7 @@ int transport_push(struct repository *r,
12121212
struct string_list needs_pushing = STRING_LIST_INIT_DUP;
12131213
struct oid_array commits = OID_ARRAY_INIT;
12141214

1215-
trace2_region_enter("transport_push", "check_submodules", the_repository);
1215+
trace2_region_enter("transport_push", "check_submodules", r);
12161216
for (; ref; ref = ref->next)
12171217
if (!is_null_oid(&ref->new_oid))
12181218
oid_array_append(&commits,
@@ -1223,18 +1223,18 @@ int transport_push(struct repository *r,
12231223
transport->remote->name,
12241224
&needs_pushing)) {
12251225
oid_array_clear(&commits);
1226-
trace2_region_leave("transport_push", "check_submodules", the_repository);
1226+
trace2_region_leave("transport_push", "check_submodules", r);
12271227
die_with_unpushed_submodules(&needs_pushing);
12281228
}
12291229
string_list_clear(&needs_pushing, 0);
12301230
oid_array_clear(&commits);
1231-
trace2_region_leave("transport_push", "check_submodules", the_repository);
1231+
trace2_region_leave("transport_push", "check_submodules", r);
12321232
}
12331233

12341234
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);
12361236
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);
12381238
} else
12391239
push_ret = 0;
12401240
err = push_had_errors(remote_refs);

0 commit comments

Comments
 (0)