mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
transport-helper: mismerge fix
Commit9c51558
(transport-helper: trivial code shuffle) moved these lines above, but99d9ec0
(Merge branch 'fc/transport-helper-no-refspec') had a wrong merge conflict and readded them. Reported-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3d092bfc6f
commit
a21455ae66
|
@ -874,9 +874,6 @@ static int push_refs_with_export(struct transport *transport,
|
|||
}
|
||||
free(private);
|
||||
|
||||
if (ref->deletion)
|
||||
die("remote-helpers do not support ref deletion");
|
||||
|
||||
if (ref->peer_ref) {
|
||||
if (strcmp(ref->peer_ref->name, ref->name))
|
||||
die("remote-helpers do not support old:new syntax");
|
||||
|
|
Loading…
Reference in a new issue