* [PATCH] transport-helper: barf when user tries old:new
@ 2013-05-21 1:02 Felipe Contreras
2013-05-21 16:32 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Felipe Contreras @ 2013-05-21 1:02 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Sverre Rabbelier, Jeff King, Felipe Contreras
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>
---
I did fix this properly, but was beaten by shoots from the hip[1]. I won't
bother rationalizing if this makes sense for 'master', or writing tests. This
patch can't possibly make anything worst. If somebody is interested, there's
proper fix: [1], with explanation, tests, and everything.
[1] http://article.gmane.org/gmane.comp.version-control.git/223706
transport-helper.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 522d791..a782a9b 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))
--
1.8.3.rc3.1.gf572ce5.dirty
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] transport-helper: barf when user tries old:new
2013-05-21 1:02 [PATCH] transport-helper: barf when user tries old:new Felipe Contreras
@ 2013-05-21 16:32 ` Junio C Hamano
2013-05-21 21:12 ` Felipe Contreras
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2013-05-21 16:32 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git, Sverre Rabbelier, Jeff King
Felipe Contreras <felipe.contreras@gmail.com> writes:
> 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>
> ---
>
> I won't
> bother rationalizing if this makes sense for 'master'
As this is a change to an old code/behaviour that was with us with
many released versions, it hardly is for 'master' during -rc period.
I think your dry-run one (the reroll) is a good fix but for the same
reason I'd rather see us apply after 1.8.3 final.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] transport-helper: barf when user tries old:new
2013-05-21 16:32 ` Junio C Hamano
@ 2013-05-21 21:12 ` Felipe Contreras
0 siblings, 0 replies; 3+ messages in thread
From: Felipe Contreras @ 2013-05-21 21:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Sverre Rabbelier, Jeff King
On Tue, May 21, 2013 at 11:32 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>> I won't
>> bother rationalizing if this makes sense for 'master'
>
> As this is a change to an old code/behaviour that was with us with
> many released versions, it hardly is for 'master' during -rc period.
Probably.
--
Felipe Contreras
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-21 21:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-21 1:02 [PATCH] transport-helper: barf when user tries old:new Felipe Contreras
2013-05-21 16:32 ` Junio C Hamano
2013-05-21 21:12 ` Felipe Contreras
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.