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: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.5 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,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id A97331F403 for ; Thu, 13 Oct 2022 15:40:40 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jafw9PhA"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229929AbiJMPk1 (ORCPT ); Thu, 13 Oct 2022 11:40:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229827AbiJMPkI (ORCPT ); Thu, 13 Oct 2022 11:40:08 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0399F140DB for ; Thu, 13 Oct 2022 08:39:46 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id r13so3414542wrj.11 for ; Thu, 13 Oct 2022 08:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5fCXwnl2+bE+eJvHJ3jY59hqJeJHyZQw/4tjqn/1l5o=; b=jafw9PhANehimrsC5OiWBfZmDEnzvgSlCYNUlH/q74X7C4bYKxlpdsFg/o1IhL4GMQ vePmSCQPF2aYNUrhbZfJJaxGjY2dhjj02/rjiMelPidY45e+x5b4voyjFC7PKcas7Zap /38xxWQ1jbzsRPSz9VHfJGFSiDe/FS7dTpnTXcnq4L3uT4vT8nXUydU/ISR+qHaHdoJY 2uqYqpV7QidggBPSxs8eVD3swUiACFtZ62CIZ+1XtR6CzEcVnZ3N24hAUEQXctrk6oA3 R605rYy1PihSX3G7SpoGdC7diJWt2gxwM2gyiW5Qn9jR/LIWOOfyo+ugMyTb3mqgQI2L bAAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5fCXwnl2+bE+eJvHJ3jY59hqJeJHyZQw/4tjqn/1l5o=; b=IgvDnV4ykykUQRSvaoBBoLehQDGLLJ34f3lD7YO7T1CnIJOEiBmAtINFXrE09YQo1t ajbyOyzB5FdGt+1VJtzfoY/QMab0l+ueNy81s1iJzPsXh7UaaBz2RKIn1E6rJi6ryZB1 2hZB2epbda0x56Ixo4xJhCYFRLymcgURUU525HO6mBvTT8bZx+Xqv46RgyvajdDJoeKz BcZa/m3hI3Wlw3hs8pGZwri+MSaT/ImQdoVkRTqCVXBhuec8TSfgKvpUIqmREbBU9EbT OpT3tBTWkr1SJBrz3XxHHiZNV7GM3VOblm1dURCOlYPpd4PZ/6WWuOEEZoAI4ywCc203 4N9w== X-Gm-Message-State: ACrzQf1pKxVciHJu/QYTuT8BC54f/1/wYSvW8PTa9yTNDnmEqFNCT4Tq RLmNV5HRoCE8x1MezWA1pH0oe0c0K3gJjg== X-Google-Smtp-Source: AMsMyM4S+ES/SJEcLUcw4s8N6zipspHHt6Z84X+2Yeo8JL2UFHQGtBqg1QWZPUaF0BQ3VAsUjmKVhQ== X-Received: by 2002:a5d:4cc2:0:b0:22e:372d:9c9 with SMTP id c2-20020a5d4cc2000000b0022e372d09c9mr407538wrt.576.1665675584299; Thu, 13 Oct 2022 08:39:44 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id da12-20020a056000408c00b0022a3a887ceasm2258130wrb.49.2022.10.13.08.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 08:39:43 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Victoria Dye , Taylor Blau , Emily Shaffer , Jonathan Nieder , John Cai , Eric Sunshine , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v5 10/34] doc txt & -h consistency: add "-z" to cat-file "-h" Date: Thu, 13 Oct 2022 17:39:04 +0200 Message-Id: X-Mailer: git-send-email 2.38.0.1085.gb7e61c3016c 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 Fix a bug in db9d67f2e9c (builtin/cat-file.c: support NUL-delimited input with `-z`, 2022-07-22), before that change the SYNOPSIS and "-h" output were the same, but not afterwards. That change followed a similar earlier divergence in 473fa2df08d (Documentation: add --batch-command to cat-file synopsis, 2022-04-07). Subsequent commits will fix this sort of thing more systematically, but let's fix this one as a one-off. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/cat-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 989eee0bb4c..fa7bd891692 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -893,7 +893,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) N_("git cat-file (-t | -s) [--allow-unknown-type] "), N_("git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" - " [--textconv | --filters]"), + " [--textconv | --filters] [-z]"), N_("git cat-file (--textconv | --filters)\n" " [: | --path= ]"), NULL -- 2.38.0.1085.gb7e61c3016c