transport-helper: add support to delete branches
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>
Felipe Contreras committed
Apr 20, 2014 at 13:59 UTC
f3d0376356756c55a85a3d745858a42c26956e74
2 files changed
+21
-11
t/t5801-remote-helpers.sh
+8
@@ -102,6 +102,14 @@ test_expect_success 'push new branch with HEAD:new refspec' '
102
compare_refs local HEAD server refs/heads/new-refspec-2
103
'
104
105
+test_expect_success 'push delete branch' '
106
+ (cd local &&
107
+ git push origin :new-name
108
+ ) &&
109
+ test_must_fail git --git-dir="server/.git" \
110
+ rev-parse --verify refs/heads/new-name
111
+'
112
+
113
test_expect_success 'forced push' '
114
(cd local &&
115
git checkout -b force-test &&
transport-helper.c
+13
-11
@@ -882,9 +882,6 @@ static int push_refs_with_export(struct transport *transport,
882
char *private;
883
unsigned char sha1[20];
884
885
- if (ref->deletion)
886
- die("remote-helpers do not support ref deletion");
887
-
885
private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
886
if (private && !get_sha1(private, sha1)) {
887
strbuf_addf(&buf, "^%s", private);
@@ -896,21 +893,26 @@ static int push_refs_with_export(struct transport *transport,
893
if (ref->peer_ref) {
894
if (strcmp(ref->name, ref->peer_ref->name)) {
895
struct strbuf buf = STRBUF_INIT;
899
- const char *name;
900
- int flag;
896
902
- /* Follow symbolic refs (mainly for HEAD). */
903
- name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag);
904
- if (!name || !(flag & REF_ISSYMREF))
905
- name = ref->peer_ref->name;
897
+ if (!ref->deletion) {
898
+ const char *name;
899
+ int flag;
900
+
901
+ /* Follow symbolic refs (mainly for HEAD). */
902
+ name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag);
903
+ if (!name || !(flag & REF_ISSYMREF))
904
+ name = ref->peer_ref->name;
905
907
- strbuf_addf(&buf, "%s:%s", name, ref->name);
906
+ strbuf_addf(&buf, "%s:%s", name, ref->name);
907
+ } else
908
+ strbuf_addf(&buf, ":%s", ref->name);
909
910
string_list_append(&revlist_args, "--refspec");
911
string_list_append(&revlist_args, buf.buf);
912
strbuf_release(&buf);
913
}
913
- string_list_append(&revlist_args, ref->peer_ref->name);
914
+ if (!ref->deletion)
915
+ string_list_append(&revlist_args, ref->peer_ref->name);
916
}
917
}
918