From: Felipe Contreras Date: Sat, 12 Apr 2014 20:12:50 GMT Subject: [PATCH v9 1/6] transport-helper: mismerge fix Message-ID: <1397333575-11614-2-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1397333575-11614-1-git-send-email-felipe.contreras@gmail.com> 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 Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index ad72fbd..ea34d0c 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -881,9 +881,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"); -- 1.9.1+fc3.9.gc73078e