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=-2.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no 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 0648D20372 for ; Wed, 11 Oct 2017 07:14:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751030AbdJKHOR (ORCPT ); Wed, 11 Oct 2017 03:14:17 -0400 Received: from mail-qt0-f173.google.com ([209.85.216.173]:51676 "EHLO mail-qt0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750769AbdJKHOP (ORCPT ); Wed, 11 Oct 2017 03:14:15 -0400 Received: by mail-qt0-f173.google.com with SMTP id q4so2464235qtq.8 for ; Wed, 11 Oct 2017 00:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=t0hphjg6UHPaAzCizn/owV41yuP8iIthqxHO4Y+1FQw=; b=axRlw/r9sXDnJWa1IxVZ3/UDuxHGx2RhmRt8FQlsUh1ctZ4JXxqpRPu+6lvCorIgKK oPvXAHFzfkN/sxGCnbSWBTWkriAglKsOAK4Zo3J+VHSSF+fpDfbfDBPcaNkKAUBoQZAa NhvBt59li2XPe3foU4lOBA0TK1Zv+1Ottd4xGPBIhiWylAspDFwcp+wokYyzgQdqSa9S zYw9w2z8irOwXtmM2z1GBKbGin1S3dlqFImAckyFgLjE5WTlprMx0umz0WVAq4eKOzpo A/ZINtKc+rzLOrFTtPl4Brynhocda6ifd3mFYqPUxBu49cggneXu6KNY6y/dPIoP0Y1/ u0Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=t0hphjg6UHPaAzCizn/owV41yuP8iIthqxHO4Y+1FQw=; b=FMFEnAO+jWkY4O1fETdP7GWqbYlIoM2m353+ofjNrPevZZ/uzGtWfON6I0Gk34T3si 5zLlUMDFQBGbEXxHGKjmBtcyOj6qnqXtpIoj1PU1wQ+Rhd/EG5YpLZNqTO8pa1pLuJaL xa3JpRfYP4oOdgjTGi8Sehoqjb1y0OolwB1azSziI6TwxOQZx5kCVxKgGN+hF3CJQ10H bugqcjgL8qX9t6m5pR5t31THHZ/8RkAkY9XKJmNFx33vqDVZQeAkcD+wxyvft1RpmUUG SfIFugOwrH1PgOJZiG4be0mDZp7aVfLDaMTRLVeZG4I/uD85fpVfAoXapExYG57QbYuD Z59A== X-Gm-Message-State: AMCzsaV0T//k5z7l6twJVy2lOSHNc72saWGJsWfjkZLlwNnrjQJ6syVc gHdTfceracX3XKMB4NKQPxt4DtMrYCMmkI8CPfjy2PZ7 X-Google-Smtp-Source: AOwi7QBlKgkdbxODxhZ44T2OqiwGBJtASm/3kP2oEhuh3qxOcfx6pnl/a22pGzN0u2qSn+VkYHnWZUIGcUGZUTFshns= X-Received: by 10.237.57.135 with SMTP id m7mr22069017qte.4.1507706055013; Wed, 11 Oct 2017 00:14:15 -0700 (PDT) MIME-Version: 1.0 Received: by 10.140.101.178 with HTTP; Wed, 11 Oct 2017 00:14:14 -0700 (PDT) In-Reply-To: References: From: Marius Paliga Date: Wed, 11 Oct 2017 09:14:14 +0200 Message-ID: Subject: Re: Enhancement request: git-push: Allow (configurable) default push-option To: Stefan Beller Cc: "git@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Including proposed patch... Signed-off-by: Marius Paliga --- Documentation/git-push.txt | 3 +++ builtin/push.c | 11 ++++++++++- t/t5545-push-options.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 3e76e99f3..133c42183 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -161,6 +161,9 @@ already exists on the remote side. Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. + Default push options can also be specified with configuration + variable `push.optiondefault`. String(s) specified here will always + be passed to the server without need to specify it using `--push-option` --receive-pack=:: --exec=:: diff --git a/builtin/push.c b/builtin/push.c index 2ac810422..4dd5d6f0e 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -32,6 +32,8 @@ static const char **refspec; static int refspec_nr; static int refspec_alloc; +static struct string_list push_options = STRING_LIST_INIT_DUP; + static void add_refspec(const char *ref) { refspec_nr++; @@ -467,6 +469,8 @@ static int git_push_config(const char *k, const char *v, void *cb) { int *flags = cb; int status; + const struct string_list *default_push_options; + struct string_list_item *item; status = git_gpg_config(k, v, NULL); if (status) @@ -505,6 +509,12 @@ static int git_push_config(const char *k, const char *v, void *cb) recurse_submodules = val; } + default_push_options = git_config_get_value_multi("push.optiondefault"); + if (default_push_options) + for_each_string_list_item(item, default_push_options) + if (!string_list_has_string(&push_options, item->string)) + string_list_append(&push_options, item->string); + return git_default_config(k, v, NULL); } @@ -515,7 +525,6 @@ int cmd_push(int argc, const char **argv, const char *prefix) int push_cert = -1; int rc; const char *repo = NULL; /* default repository */ - struct string_list push_options = STRING_LIST_INIT_DUP; const struct string_list_item *item; struct option options[] = { diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh index 90a4b0d2f..575f3dc38 100755 --- a/t/t5545-push-options.sh +++ b/t/t5545-push-options.sh @@ -140,6 +140,54 @@ test_expect_success 'push options and submodules' ' test_cmp expect parent_upstream/.git/hooks/post-receive.push_options ' +test_expect_success 'default push option' ' + mk_repo_pair && + git -C upstream config receive.advertisePushOptions true && + ( + cd workbench && + test_commit one && + git push --mirror up && + test_commit two && + git -c push.optiondefault=default push up master + ) && + test_refs master master && + echo "default" >expect && + test_cmp expect upstream/.git/hooks/pre-receive.push_options && + test_cmp expect upstream/.git/hooks/post-receive.push_options +' + +test_expect_success 'two default push options' ' + mk_repo_pair && + git -C upstream config receive.advertisePushOptions true && + ( + cd workbench && + test_commit one && + git push --mirror up && + test_commit two && + git -c push.optiondefault=default1 -c push.optiondefault=default2 push up master + ) && + test_refs master master && + printf "default1\ndefault2\n" >expect && + test_cmp expect upstream/.git/hooks/pre-receive.push_options && + test_cmp expect upstream/.git/hooks/post-receive.push_options +' + +test_expect_success 'default and manual push options' ' + mk_repo_pair && + git -C upstream config receive.advertisePushOptions true && + ( + cd workbench && + test_commit one && + git push --mirror up && + test_commit two && + git -c push.optiondefault=default push --push-option=manual up master + ) && + test_refs master master && + printf "default\nmanual\n" >expect && + test_cmp expect upstream/.git/hooks/pre-receive.push_options && + test_cmp expect upstream/.git/hooks/post-receive.push_options +' + . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd -- 2.14.1 2017-10-04 17:20 GMT+02:00 Marius Paliga : > Hi Stefan, > > I will look at it. > > Thanks, > Marius > > > 2017-10-03 18:53 GMT+02:00 Stefan Beller : >> On Tue, Oct 3, 2017 at 3:15 AM, Marius Paliga wrote: >>> There is a need to pass predefined push-option during "git push" >>> without need to specify it explicitly. >>> >>> In another words we need to have a new "git config" variable to >>> specify string that will be automatically passed as "--push-option" >>> when pushing to remote. >>> >>> Something like the following: >>> >>> git config push.optionDefault AllowMultipleCommits >>> >>> and then command >>> git push >>> would silently run >>> git push --push-option "AllowMultipleCommits" >> >> We would need to >> * design this feature (seems like you already have a good idea what you need) >> * implement it (see builtin/push.c): >> - move "struct string_list push_options = STRING_LIST_INIT_DUP;" >> to be a file-static variable, such that we have access to it outside >> of cmd_push. >> - In git_push_config in builtin/push.c that parses the config, we'd >> need to check >> for "push.optionDefault" and add these to the push_options (I assume multiple >> are allowed) >> * document it (Documentation/git-push.txt) >> * add a test for it ? (t/t5545-push-options.sh) >> >> Care to write a patch? Otherwise I'd mark it up as part of >> #leftoverbits for now, >> as it seems like a good starter project. >> >> Thanks, >> Stefan