Skip to content

Commit

Permalink
transport-helper: mismerge fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed Oct 31, 2013
1 parent 3d092bf commit a21455a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions transport-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit a21455a

Please sign in to comment.