Skip to content

Commit 3ea7d09

Browse files
peffgitster
authored andcommitted
transport-helper: don't feed bogus refs to export push
When we want to push to a remote helper that has the "export" capability, we collect all of the refs we want to push and then feed them to fast-export. However, the list of refs is actually a list of remote refs, not local refs. The mapped local refs are included via the peer_ref pointer. So when we add an argument to our fast-export command line, we must be sure to use the local peer_ref name (and if there is no local name, it is because we are not actually sending that ref, or we may not even have the ref at all). Signed-off-by: Jeff King <[email protected]> Signed-off-by: Sverre Rabbelier <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4e51ba2 commit 3ea7d09

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

t/t5800-remote-helpers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ test_expect_failure 'fetch multiple branches' '
106106
compare_refs server new localclone refs/remotes/origin/new
107107
'
108108

109-
test_expect_failure 'push when remote has extra refs' '
109+
test_expect_success 'push when remote has extra refs' '
110110
(cd clone &&
111111
echo content >>file &&
112112
git commit -a -m six &&

transport-helper.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,8 @@ static int push_refs_with_export(struct transport *transport,
730730
}
731731
free(private);
732732

733-
string_list_append(&revlist_args, ref->name);
733+
if (ref->peer_ref)
734+
string_list_append(&revlist_args, ref->peer_ref->name);
734735

735736
}
736737

0 commit comments

Comments
 (0)