transport-helper: mismerge fix
Commit 9c51558 (transport-helper: trivial code shuffle) moved these lines above, but 99d9ec0 (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>
Felipe Contreras committed
Oct 31, 2013 at 03:36 UTC
a21455ae664c1a29c157e2bc5ea3abe8e2699eca
1 file changed
-3
transport-helper.c
-3
@@ -874,9 +874,6 @@ static int push_refs_with_export(struct transport *transport,
874
}
875
free(private);
876
877
- if (ref->deletion)
878
- die("remote-helpers do not support ref deletion");
879
-
877
if (ref->peer_ref) {
878
if (strcmp(ref->peer_ref->name, ref->name))
879
die("remote-helpers do not support old:new syntax");