Re: [PATCH] push: allow pushing new branches with --force-with-lease
Junio C Hamano <gitster@pobox.com> writes:
Show 7 quoted lines
> I suspect that the if/else cascade in the loop in apply_cas() can
> also be taught that ':' followed by an empty string asks to check
> that the target ref does not exist, in order to make it a bit more
> useful for folks who do not rely on the "use the last observed
> status of the tracking branch".
>
> That would make the "explicit" test much less cumbersome to read.
In other words, something like this, perhaps?
remote.c | 2 ++
t/t5533-push-cas.sh | 12 ++++++++++++
2 files changed, 14 insertions(+)
diff --git a/remote.c b/remote.c
index b35ffd9..55812d8 100644
--- a/remote.c
+++ b/remote.c
@@ -2303,6 +2303,8 @@ int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unse
entry = add_cas_entry(cas, arg, colon - arg);
if (!*colon)
entry->use_tracking = 1;
+ else if (!colon[1])
+ hashclr(entry->expect);
else if (get_sha1(colon + 1, entry->expect))
return error("cannot parse expected object name '%s'", colon + 1);
return 0;
diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
index 4276b1b..04f4636 100755
--- a/t/t5533-push-cas.sh
+++ b/t/t5533-push-cas.sh
@@ -215,6 +215,18 @@ test_expect_success 'new branch covered by force-with-lease (explicit)' '
test_cmp expect actual
'
+test_expect_success 'new branch covered by force-with-lease (less cumbersome)' '
+ setup_srcdst_basic &&
+ (
+ cd dst &&
+ git branch another master &&
+ git push --force-with-lease=another: origin another
+ ) &&
+ git ls-remote dst refs/heads/another >expect &&
+ git ls-remote src refs/heads/another >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'new branch already exists' '
setup_srcdst_basic &&
(
--
2.9.2-629-gdd92683
Junio C Hamano <gitster@pobox.com>