From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id E8CD91F8C6 for ; Fri, 10 Sep 2021 15:38:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234579AbhIJPkI (ORCPT ); Fri, 10 Sep 2021 11:40:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234516AbhIJPkC (ORCPT ); Fri, 10 Sep 2021 11:40:02 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE93CC061764 for ; Fri, 10 Sep 2021 08:38:50 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id l18-20020a05600c4f1200b002f8cf606262so1777798wmq.1 for ; Fri, 10 Sep 2021 08:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zvOUNevOhcX3AhGpGhMtQtfRlz4ppjsS5O3y3/LTums=; b=MHJsrDCECvEbaKdzY9BHEQRRmr6nwQHF26ltr7wfuNuiVqmcHbK6aD+EWTUiCBxFWb 7MdkBj0yVJ/1J6zK6eZqF1JqA95wl34ccRqqoN5NBLcneWygfDWFK5cwgrKnUijMd2F6 msW/wjejZSGZvj9lFap9mwo8jGobMcZnjyLSOQTHDm3oPI+4R5MpkqbsgTUc1zXrDdp1 ZhUqYnXkTkaSAVpysuO+7USVaMjRjxptIlhDlBSqyvoY8g2a+LAUB/CWALPVYvzFhuX7 bPxTQN2gnzCsLGjy5oxtUKQDApwnzfNkFqljUEZi+xws2aIBBgMX/pfg6m9cxo2RD3V1 FmHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zvOUNevOhcX3AhGpGhMtQtfRlz4ppjsS5O3y3/LTums=; b=pPyL50NIkkVJrwWDs8Citp4XpNNLcCYu5cUZlyKyGlFVV297mKxiXVTWnJUXYvnfWs 3ay1NRXrQUfjs/qqDJAoQpUffv3xVBoA2R7aRfExODKQiM0gLAxa5Sebm+Dn23XjknNH HuyPz0K2A5qLk+1XJxh1MTZD4G7g9/iyZ4ucWrBmQaxjWRYW5Z8/ccH7xjUJKnOjwgCH vCXTKeVR62D9Upgf0+RrRtnBNaAqfTj1rp1tJDAeSxQKtr1BGORWb5IT0EDamRNgS7U1 /HPNy29VUeSX6jP+3SDthtLblJn0wkt3/j4EOXT1zYt3nESgFXTce6o2i70y5/B7QUk1 2jAg== X-Gm-Message-State: AOAM530hKE3cpTaXxpSPVgL0z+J8mlDkXV1YYqE9a8GcynXoKXJ8i3vM xYz98escE4LuuuZowmzg+jOinPNcQzlIoA== X-Google-Smtp-Source: ABdhPJyN0vDkvOUWTICIEJGvLjpuRQ20DwzXEWW7I+Z4pwZAd+EiIzxQL8v2Z0rzAgFX2DRKkCJtmg== X-Received: by 2002:a1c:7dc8:: with SMTP id y191mr8927192wmc.6.1631288329112; Fri, 10 Sep 2021 08:38:49 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id i5sm4181972wmq.17.2021.09.10.08.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 08:38:48 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Carlo Arenas , Eric Sunshine , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 5/6] send-pack: properly use parse_options() API for usage string Date: Fri, 10 Sep 2021 17:38:35 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.876.g423ac861752 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When "send-pack" was changed to use the parse_options() API in 068c77a5189 (builtin/send-pack.c: use parse_options API, 2015-08-19) it was made to use one very long line, instead it should split them up with newlines. Furthermore we were including an inline explanation that you couldn't combine "--all" and "", but unlike in the "blame" case this was not preceded by an empty string. Let's instead show that --all and can't be combined in the the usual language of the usage syntax instead. We can make it clear that one of the two options "--foo" and "--bar" is mandatory, but that the two are mutually exclusive by referring to them as "( --foo | --bar )". Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-send-pack.txt | 4 ++-- builtin/send-pack.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index 44fd146b912..be41f119740 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send-pack.txt @@ -9,10 +9,10 @@ git-send-pack - Push objects over Git protocol to another repository SYNOPSIS -------- [verse] -'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=] +'git send-pack' [--dry-run] [--force] [--receive-pack=] [--verbose] [--thin] [--atomic] [--[no-]signed|--signed=(true|false|if-asked)] - [:] [...] + [:] (--all | ...) DESCRIPTION ----------- diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 729dea1d255..89321423125 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -17,10 +17,10 @@ #include "protocol.h" static const char * const send_pack_usage[] = { - N_("git send-pack [--all | --mirror] [--dry-run] [--force] " - "[--receive-pack=] [--verbose] [--thin] [--atomic] " - "[:] [...]\n" - " --all and explicit specification are mutually exclusive."), + N_("git send-pack [--mirror] [--dry-run] [--force]\n" + " [--receive-pack=]\n" + " [--verbose] [--thin] [--atomic]\n" + " [:] (--all | ...)"), NULL, }; -- 2.33.0.876.g423ac861752