From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D52CB203E3 for ; Tue, 26 Jul 2016 20:45:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964798AbcGZUpU (ORCPT ); Tue, 26 Jul 2016 16:45:20 -0400 Received: from mta02.prd.rdg.aluminati.org ([94.76.243.215]:55408 "EHLO mta02.prd.rdg.aluminati.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964789AbcGZUpR (ORCPT ); Tue, 26 Jul 2016 16:45:17 -0400 Received: from mta02.prd.rdg.aluminati.org (localhost [127.0.0.1]) by mta.aluminati.local (Postfix) with ESMTP id F181223096; Tue, 26 Jul 2016 21:45:15 +0100 (BST) Received: from localhost (localhost [127.0.0.1]) by mta02.prd.rdg.aluminati.org (Postfix) with ESMTP id ECCF736D1; Tue, 26 Jul 2016 21:45:15 +0100 (BST) X-Quarantine-ID: X-Virus-Scanned: Debian amavisd-new at mta02.prd.rdg.aluminati.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from mta.aluminati.local ([127.0.0.1]) by localhost (mta02.prd.rdg.aluminati.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id MW2qMVbZUjSw; Tue, 26 Jul 2016 21:45:14 +0100 (BST) Received: from river.lan (unknown [10.2.0.9]) by mta02.prd.rdg.aluminati.org (Postfix) with ESMTPSA id A317336B0; Tue, 26 Jul 2016 21:45:08 +0100 (BST) From: John Keeping To: git@vger.kernel.org Cc: John Keeping , Junio C Hamano , =?UTF-8?q?Jakub=20Nar=C4=99bski?= Subject: [PATCH v3 2/3] push: add shorthand for --force-with-lease branch creation Date: Tue, 26 Jul 2016 21:44:44 +0100 Message-Id: <0db0f8551d59e91cf2ad9a9853cf0dfd2750b748.1469565810.git.john@keeping.me.uk> X-Mailer: git-send-email 2.9.2.639.g855ae9f In-Reply-To: References: In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Allow the empty string to stand in for the null SHA-1 when pushing a new branch, like we do when deleting branches. This means that the following command ensures that `new-branch` is created on the remote (that is, is must not already exist): git push --force-with-lease=new-branch: origin new-branch Signed-off-by: John Keeping --- Changes in v3: - use hashclr() - pull 'new branch already exists' test forward from patch 3 and use explicit --force-with-lease syntax Documentation/git-push.txt | 3 ++- remote.c | 2 ++ t/t5533-push-cas.sh | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index bf7c9a2..927a034 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -201,7 +201,8 @@ if it is going to be updated, by requiring its current value to be the same as the specified value `` (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when -this form is used). +this form is used). If `` is the empty string, then the named ref +must not already exist. + Note that all forms other than `--force-with-lease=:` that specifies the expected current value of the ref explicitly are diff --git a/remote.c b/remote.c index a326e4e..42c4a34 100644 --- a/remote.c +++ b/remote.c @@ -2294,6 +2294,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 c732012..ed631c3 100755 --- a/t/t5533-push-cas.sh +++ b/t/t5533-push-cas.sh @@ -191,4 +191,30 @@ 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 (explicit)' ' + 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 already exists' ' + setup_srcdst_basic && + ( + cd src && + git checkout -b branch master && + test_commit c + ) && + ( + cd dst && + git branch branch master && + test_must_fail git push --force-with-lease=branch: origin branch + ) +' + test_done -- 2.9.2.639.g855ae9f