[PATCH v3 09/10] transport-helper: add support to delete branches
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:58:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras <redacted> --- t/t5801-remote-helpers.sh | 8 ++++++++ transport-helper.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 8e2dd9f..a66a4e3 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh@@ -94,6 +94,14 @@ test_expect_success 'push new branch with old:new refspec' ' compare_refs local HEAD server refs/heads/new-refspec ' +test_expect_success 'push delete branch' ' + (cd local && + git push origin :new-name + ) && + test_must_fail git --git-dir="server/.git" \ + rev-parse --verify refs/heads/new-name +' + test_expect_success 'cloning without refspec' ' GIT_REMOTE_TESTGIT_REFSPEC="" \ git clone "testgit::${PWD}/server" local2 2>error &&
diff --git a/transport-helper.c b/transport-helper.c
index cffeb9a..ddb3309 100644
--- a/transport-helper.c
+++ b/transport-helper.c@@ -849,12 +849,16 @@ static int push_refs_with_export(struct transport *transport, if (ref->peer_ref) { if (strcmp(ref->name, ref->peer_ref->name)) { struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s:%s", ref->peer_ref->name, ref->name); + if (!ref->deletion) + strbuf_addf(&buf, "%s:%s", ref->peer_ref->name, ref->name); + else + strbuf_addf(&buf, ":%s", ref->name); string_list_append(&revlist_args, "--refspec"); string_list_append(&revlist_args, buf.buf); strbuf_release(&buf); } - string_list_append(&revlist_args, ref->peer_ref->name); + if (!ref->deletion) + string_list_append(&revlist_args, ref->peer_ref->name); } }
--
1.8.4-fc