From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 31 Oct 2013 09:36:29 +0000 (-0600)
Subject: transport-helper: mismerge fix
X-Git-Tag: v2.0.0-rc0~99^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a21455ae664c1a29c157e2bc5ea3abe8e2699eca

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>
---

diff --git a/transport-helper.c b/transport-helper.c
index b32e2d64dd..985eeea598 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -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");