[PATCH v2 06/20] transport-helper: don't feed bogus refs to export push
- From
Sverre Rabbelier <srabbelier@gmail.com>
- Date
- Jun 19, 2011, 15:18 UTC
- Message-ID
- <1308496725-22329-7-git-send-email-srabbelier@gmail.com>
- In-Reply-To
- <1308496725-22329-1-git-send-email-srabbelier@gmail.com>
From: Jeff King <peff@peff.net>
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> ---
Unchanged.
t/t5800-remote-helpers.sh | 2 +- transport-helper.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh index ca115cc..ceb0010 100755 --- a/t/t5800-remote-helpers.sh +++ b/t/t5800-remote-helpers.sh @@ -106,7 +106,7 @@ test_expect_failure 'fetch multiple branches' ' compare_refs server new localclone refs/remotes/origin/new ' -test_expect_failure 'push when remote has extra refs' ' +test_expect_success 'push when remote has extra refs' ' (cd clone && echo content >>file && git commit -a -m six && diff --git a/transport-helper.c b/transport-helper.c index b560b64..34d18aa 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -730,7 +730,8 @@ static int push_refs_with_export(struct transport *transport, } free(private); - string_list_append(&revlist_args, ref->name); + if (ref->peer_ref) + string_list_append(&revlist_args, ref->peer_ref->name); }
-- 1.7.5.1.292.g728120