undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport-helper: add support to delete branches

Browse Source 
For remote-helpers that use 'export' to push.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2014-04-20 13:59:29 -05:00 committed by Junio C Hamano
parent 60ed26438c
commit f3d0376356
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t5801-remote-helpers.sh
View File

@ -102,6 +102,14 @@ test_expect_success 'push new branch with HEAD:new refspec' '
compare_refs local HEAD server refs/heads/new-refspec-2 compare_refs local HEAD server refs/heads/new-refspec-2
' '
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 'forced push' ' test_expect_success 'forced push' '
(cd local && (cd local &&
git checkout -b force-test && git checkout -b force-test &&

24
transport-helper.c
View File

@ -882,9 +882,6 @@ static int push_refs_with_export(struct transport *transport,
char *private; char *private;
unsigned char sha1[20]; unsigned char sha1[20];
if (ref->deletion)
die("remote-helpers do not support ref deletion");
private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name); private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
if (private && !get_sha1(private, sha1)) { if (private && !get_sha1(private, sha1)) {
strbuf_addf(&buf, "^%s", private); strbuf_addf(&buf, "^%s", private);
@ -896,21 +893,26 @@ static int push_refs_with_export(struct transport *transport,
if (ref->peer_ref) { if (ref->peer_ref) {
if (strcmp(ref->name, ref->peer_ref->name)) { if (strcmp(ref->name, ref->peer_ref->name)) {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
const char *name;
int flag;
/* Follow symbolic refs (mainly for HEAD). */ if (!ref->deletion) {
name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag); const char *name;
if (!name || !(flag & REF_ISSYMREF)) int flag;
name = ref->peer_ref->name;
strbuf_addf(&buf, "%s:%s", name, ref->name); /* Follow symbolic refs (mainly for HEAD). */
name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag);
if (!name || !(flag & REF_ISSYMREF))
name = ref->peer_ref->name;
strbuf_addf(&buf, "%s:%s", name, ref->name);
} else
strbuf_addf(&buf, ":%s", ref->name);
string_list_append(&revlist_args, "--refspec"); string_list_append(&revlist_args, "--refspec");
string_list_append(&revlist_args, buf.buf); string_list_append(&revlist_args, buf.buf);
strbuf_release(&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);
} }
} }