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 <peff@peff.net> Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 16, 2011 at 15:03 UTC
3ea7d09461e4e1b95f6a55f04b2eb66d929464bd
2 files changed
+3
-2
t/t5800-remote-helpers.sh
+1
-1
@@ -106,7 +106,7 @@ test_expect_failure 'fetch multiple branches' '
106
compare_refs server new localclone refs/remotes/origin/new
107
'
108
109
-test_expect_failure 'push when remote has extra refs' '
109
+test_expect_success 'push when remote has extra refs' '
110
(cd clone &&
111
echo content >>file &&
112
git commit -a -m six &&
transport-helper.c
+2
-1
@@ -730,7 +730,8 @@ static int push_refs_with_export(struct transport *transport,
730
}
731
free(private);
732
733
- string_list_append(&revlist_args, ref->name);
733
+ if (ref->peer_ref)
734
+ string_list_append(&revlist_args, ref->peer_ref->name);
735
736
}
737