summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-10-31 03:36:29 -0600
committerJunio C Hamano <gitster@pobox.com>2013-10-31 11:16:40 -0700
commita21455ae664c1a29c157e2bc5ea3abe8e2699eca (patch)
tree849957bb922b5521c8a241bf9d941143d75cdaea
parent3d092bfc6f2d9a998967979f926c661e9762601c (diff)
downloadgit-a21455ae664c1a29c157e2bc5ea3abe8e2699eca.tar.gz
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>
-rw-r--r--transport-helper.c3
1 files changed, 0 insertions, 3 deletions
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");