From 64ac39af7020f3a8bc52d51137804ce9f46baf66 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Tue, 26 Jul 2016 21:44:45 +0100 Subject: push: allow pushing new branches with --force-with-lease If there is no upstream information for a branch, it is likely that it is newly created and can safely be pushed under the normal fast-forward rules. Relax the --force-with-lease check so that we do not reject these branches immediately but rather attempt to push them as new branches, using the null SHA-1 as the expected value. In fact, it is already possible to push new branches using the explicit --force-with-lease=: syntax, so all we do here is make this behaviour the default if no explicit "expect" value is specified. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- t/t5533-push-cas.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 't/t5533-push-cas.sh') diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh index ed631c3d0b..09899af3b0 100755 --- a/t/t5533-push-cas.sh +++ b/t/t5533-push-cas.sh @@ -191,6 +191,18 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' ' test_cmp expect actual ' +test_expect_success 'new branch covered by force-with-lease' ' + setup_srcdst_basic && + ( + cd dst && + git branch branch master && + git push --force-with-lease=branch origin branch + ) && + git ls-remote dst refs/heads/branch >expect && + git ls-remote src refs/heads/branch >actual && + test_cmp expect actual +' + test_expect_success 'new branch covered by force-with-lease (explicit)' ' setup_srcdst_basic && ( -- cgit v1.2.3