summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-05-20 20:02:45 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-21 09:53:59 -0700
commit67c9c782dae17822266783f8b5e15d73e7c91c65 (patch)
tree52bf79778f3df007bceaebe8634448788bc11766
parentMerge git://git.bogomips.org/git-svn (diff)
downloadtgif-67c9c782dae17822266783f8b5e15d73e7c91c65.tar.xz
transport-helper: barf when user tries old:new
Otherwise with certain remote helpers (the ones that support 'export'), the users will be pushing to the wrong branch: git push topic:master Will push the topic branch, as if the user typed: git push topic Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--transport-helper.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/transport-helper.c b/transport-helper.c
index 522d79178e..a782a9bd71 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -813,9 +813,11 @@ static int push_refs_with_export(struct transport *transport,
die("remote-helpers do not support ref deletion");
}
- if (ref->peer_ref)
+ if (ref->peer_ref) {
+ if (strcmp(ref->peer_ref->name, ref->name))
+ die("remote-helpers do not support old:new syntax");
string_list_append(&revlist_args, ref->peer_ref->name);
-
+ }
}
if (get_exporter(transport, &exporter, &revlist_args))