[PATCH v7 01/11] transport-helper: fix extra lines
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Nov 12, 2013, 20:56 UTC
- Message-ID
- <1384289830-5471-2-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1384289830-5471-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 <rhansen@bbn.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- transport-helper.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c index 673b7c2..b66c7fd 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -875,9 +875,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.8.4.2+fc1