From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan =?UTF-8?B?S3LDvGdlcg==?= Subject: [PATCH RFC] builtin-push: add --delete as syntactic sugar for :foo Date: Mon, 9 Nov 2009 13:09:35 +0100 Message-ID: <20091109130935.2bea7771@perceptron> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: Git ML X-From: git-owner@vger.kernel.org Mon Nov 09 13:09:58 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1N7T4A-0007nz-AE for gcvg-git-2@lo.gmane.org; Mon, 09 Nov 2009 13:09:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754836AbZKIMJi convert rfc822-to-quoted-printable (ORCPT ); Mon, 9 Nov 2009 07:09:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754820AbZKIMJi (ORCPT ); Mon, 9 Nov 2009 07:09:38 -0500 Received: from zoidberg.org ([88.198.6.61]:37075 "EHLO cthulhu.zoidberg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754492AbZKIMJh convert rfc822-to-8bit (ORCPT ); Mon, 9 Nov 2009 07:09:37 -0500 Received: from perceptron (xdsl-78-35-153-14.netcologne.de [::ffff:78.35.153.14]) (IDENT: unknown, AUTH: LOGIN jast, TLS: TLSv1/SSLv3,128bits,AES128-SHA) by cthulhu.zoidberg.org with esmtp; Mon, 09 Nov 2009 13:09:41 +0100 id 004D01FF.4AF80685.0000615A X-Mailer: Claws Mail 3.7.3 (GTK+ 2.18.3; i486-pc-linux-gnu) X-Obscure-Spam: http://music-jk.net/ Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Refspecs without a source side have been reported as confusing by many. As an alternative, this adds support for commands like: git push origin --delete somebranch Specifically, --delete will prepend a colon to all colon-less refspecs given on the command line. Signed-off-by: Jan Kr=C3=BCger --- Since I consider this extension pure syntactic sugar, it doesn't change the underlying transport code. As such it's a relatively non-invasive change. One might imagine a different implementation that supports combining --delete with --all and/or --tags, but perhaps it's better if people are forced to do that kind of thing manually. builtin-push.c | 15 +++++++++++++++ t/t5516-fetch-push.sh | 6 ++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/builtin-push.c b/builtin-push.c index 8631c06..4ae9166 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -15,6 +15,7 @@ static const char * const push_usage[] =3D { }; =20 static int thin; +static int deleterefs; static const char *receivepack; =20 static const char **refspec; @@ -44,6 +45,14 @@ static void set_refspecs(const char **refs, int nr) strcat(tag, refs[i]); ref =3D tag; } + if (deleterefs && !strchr(ref, ':')) { + char *delref; + int len =3D strlen(refs[i] + 1); + delref =3D xmalloc(len); + strcpy(delref, ":"); + strcat(delref, refs[i]); + ref =3D delref; + } add_refspec(ref); } } @@ -181,6 +190,7 @@ int cmd_push(int argc, const char **argv, const cha= r *prefix) OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL), OPT_BIT( 0 , "mirror", &flags, "mirror all refs", (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)), + OPT_BOOLEAN( 0, "delete", &deleterefs, "delete refs"), OPT_BOOLEAN( 0 , "tags", &tags, "push tags (can't be used with --all= or --mirror)"), OPT_BIT('n' , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN), OPT_BIT( 0, "porcelain", &flags, "machine-readable output", TRANSPO= RT_PUSH_PORCELAIN), @@ -193,6 +203,11 @@ int cmd_push(int argc, const char **argv, const ch= ar *prefix) =20 argc =3D parse_options(argc, argv, prefix, options, push_usage, 0); =20 + if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_P= USH_MIRROR)))) + die("--delete is incompatible with --all, --mirror and --tags"); + if (deleterefs && argc < 2) + die("--delete doesn't make sense without any refs"); + if (tags) add_refspec("refs/tags/*"); =20 diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 6889a53..aa1450a 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -546,6 +546,12 @@ test_expect_success 'allow deleting an invalid rem= ote ref' ' =20 ' =20 +test_expect_success 'allow deleting a ref using --delete' ' + mk_test heads/master && + git push testrepo --delete master && + (cd testrepo && test_must_fail git rev-parse --verify refs/heads/mast= er) +' + test_expect_success 'warn on push to HEAD of non-bare repository' ' mk_test heads/master (cd testrepo && --=20 1.6.5.2.155.gbb47.dirty