[PATCH v6 10/10] transport-helper: add support to delete branches
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 454337e..c667965 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 'forced push' '
(cd local
git checkout -b force-test
diff --git a/transport-helper.c b/transport-helper.c
index 2da4259..7a95125 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -876,9 +876,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);
@@ -890,12 +887,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.2+fc1
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v6 10/10] transport-helper: add support to delete branches
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 454337e..c667965 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 'forced push' '
(cd local
git checkout -b force-test
diff --git a/transport-helper.c b/transport-helper.c
index 7411125..2257588 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -876,9 +876,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);
@@ -890,12 +887,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.2+fc1
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
