Skip to content

Commit

Permalink
transport-helper: add support to delete branches
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed Apr 21, 2014
1 parent 60ed264 commit f3d0376
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
8 changes: 8 additions & 0 deletions t/t5801-remote-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@ test_expect_success 'push new branch with HEAD:new refspec' '
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' '
(cd local &&
git checkout -b force-test &&
Expand Down
24 changes: 13 additions & 11 deletions transport-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -882,9 +882,6 @@ static int push_refs_with_export(struct transport *transport,
char *private;
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);
if (private && !get_sha1(private, sha1)) {
strbuf_addf(&buf, "^%s", private);
Expand All @@ -896,21 +893,26 @@ 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;
const char *name;
int flag;

/* 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;
if (!ref->deletion) {
const char *name;
int flag;

/* 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);
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, 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);
}
}

Expand Down

0 comments on commit f3d0376

Please sign in to comment.