From patchwork Mon Sep 5 18:50:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 12966428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0A66ECAAD3 for ; Mon, 5 Sep 2022 18:50:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232256AbiIESuW (ORCPT ); Mon, 5 Sep 2022 14:50:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231562AbiIESuS (ORCPT ); Mon, 5 Sep 2022 14:50:18 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 208BA27144 for ; Mon, 5 Sep 2022 11:50:13 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id nc14so18681051ejc.4 for ; Mon, 05 Sep 2022 11:50:13 -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; bh=gGufFw9ORLKrHuLHAK1W9skwHA6cPxS+PgUQE22kywk=; b=F0+F+CIfzMDGdqFynFyawAw6z4ZzX/1kRwgic3p/0yInoceLmkKu2N3jCl4Z1eZZMn +YV8ROtcsrrrt9L3ky1mZDy/komgDy9PheCoVdTmn7hdTJv8tmP6fzkEFq4Fs4MZigNL eoFB2JRJ4pz4q+8S7xuc4V0YaO4qP1/Vk8BAciLH7C8WfMMOh56WHuVCSi7MkRJO1Z6Y o2iiulrb1I0la72iMzUIwxt54JzniJcSSzn68PQ2FGbR4/QCCWYiIFwWIGbiwlwFvTwh uOBopBqFfBgXOfyA2pTKbnwcWixZLmCfde+cgOp56NhthkRXRkAsem86saosbWraxAug 1rUg== 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; bh=gGufFw9ORLKrHuLHAK1W9skwHA6cPxS+PgUQE22kywk=; b=12Am0NSkovUw8hyR8UlPU38VahOh0fN43iw3Hb7HI6C2Qaq3LjoiQNnhOOv8+qq6kV WceUS5IQ8JB+nhLn6BN+U4i1S+2m5EZxGUAik7EObS+JJi5XkY+s2gIzL0sj8hpa3/hZ vm8Kzq7We/J/QMgToAuqlHnYpLbyhbSh8zCIeN3fYNZ3kaATvjBKZfl37Eh1XvFH4P/v kx2+8U2GTUOKitzJvT6IKFChIpuy6olSKXTtD5BeKhgoxJcx+Spfs/BO20GtdtugZrHg b0/6lhnisaLYAXS67VmbE8E+kKMMgIszmih/3jGw+yOHBDfdsj1ESTnJjR8VDd200NGp 4Khg== X-Gm-Message-State: ACgBeo1ubyu1ZxAmPCQGGxqMKrZEhiPlh6juvT41ViZ3nKRNr0LhGBCo NTtiCZimbao02i+Eh4djy2EGgLQszuc= X-Google-Smtp-Source: AA6agR5bw6qenGw4kMA625lg528Cr2HhFtzeJS8UhAcPLapo9WVaeZFM1pdDDg2KoUrEv5Jvfj4q3w== X-Received: by 2002:a17:907:6e18:b0:73d:63d9:945f with SMTP id sd24-20020a1709076e1800b0073d63d9945fmr36849522ejc.12.1662403812397; Mon, 05 Sep 2022 11:50:12 -0700 (PDT) Received: from localhost (62-165-236-110.pool.digikabel.hu. [62.165.236.110]) by smtp.gmail.com with ESMTPSA id b7-20020a05640202c700b0044e91d8ccd2sm1964567edx.50.2022.09.05.11.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 11:50:12 -0700 (PDT) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH 1/5] t0040-parse-options: remove leftover debugging Date: Mon, 5 Sep 2022 20:50:03 +0200 Message-Id: <20220905185007.9042-2-szeder.dev@gmail.com> X-Mailer: git-send-email 2.37.3.989.g4c3dfb3304 In-Reply-To: <20220905185007.9042-1-szeder.dev@gmail.com> References: <20220819160411.1791200-1-szeder.dev@gmail.com> <20220905185007.9042-1-szeder.dev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: SZEDER Gábor --- t/t0040-parse-options.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index b19b8d3486..5cc62306e3 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -500,7 +500,6 @@ test_expect_success 'KEEP_UNKNOWN_OPT works' ' test_expect_success 'NO_INTERNAL_HELP works for -h' ' test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd -h 2>err && - cat err && grep "^error: unknown switch \`h$SQ" err && grep "^usage: " err ' @@ -509,7 +508,6 @@ for help_opt in help help-all do test_expect_success "NO_INTERNAL_HELP works for --$help_opt" " test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --$help_opt 2>err && - cat err && grep '^error: unknown option \`'$help_opt\' err && grep '^usage: ' err " From patchwork Mon Sep 5 18:50:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 12966427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D44A3C6FA83 for ; Mon, 5 Sep 2022 18:50:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232240AbiIESuU (ORCPT ); Mon, 5 Sep 2022 14:50:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231407AbiIESuS (ORCPT ); Mon, 5 Sep 2022 14:50:18 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B4F12714E for ; Mon, 5 Sep 2022 11:50:15 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id r4so12341942edi.8 for ; Mon, 05 Sep 2022 11:50:15 -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; bh=Iyb5iabM/bJ/vGyXf7iP26tuMpGNgA+LStOErTvREmo=; b=N5kNc0zNjm8U1QkEQweu5XAAYhviVlwKrfkCsEqc1rwn13ahyeaEpNxo5xcW+anOq2 VJqZxunL5ZSZvkHgJi0PVCTAQlGhztjxMGYYZDwdbHRn8gI1ppoRJFcaGWLvKXKMuZGF hrMeAE1qQAfbkKDoSC2kxp9dm+2KSRt1z0a+cyyDsTWGPSTvbm1M0Q/0EyyxpaRwQuZr VNJljgpGdipwlNzXclon3zfWndKnTEyzbLvmxywTPXkgaJp4KCauRbhyspHD+diXLlX/ h7R4mRzDCiiKenpL6OqCcVBJrZW8nepVUbarSdonAJ2mJvrvVTJGAJuOQP4XqrA75pfV jaEw== 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; bh=Iyb5iabM/bJ/vGyXf7iP26tuMpGNgA+LStOErTvREmo=; b=0IzXXrNYLBpATMQF+79JoIxRpCp1WfViYUPm11CxFw1DM8ginygm9jAdFiNtZ5gYiW 53zi8+DKEyhsCCGeqA4jLqMVp4ijtmCSEMImamPfUzrt57SIcxuzcwbEt8KHkPFMb0tv WSynX3kH7nzMWfQfUmUzJYCOLpm6wBhxcNgRNdNJlc+m2rY5sYmxpKexIuspUQkyk9mu wi/K3zW6w6vhlRwQNEj6ENo3omraOOK1POFBDB9Fwsm4bpiX5Dyd7TK2W/ByOotwP6d7 WdimyeE6qVP8YY4YXX2+fOUJOd5sCJ7uZaGlLTZsch8PbbO/Jz1AwtxQWVC6+Q7FPG+T SvZQ== X-Gm-Message-State: ACgBeo0j0moFhsYz+w/wLFySXCiJP5sxnpVonghifeIw1jJR3UexruLs 9/vMZUunDV/yWFCLiUmN3hKRhWdW1fk= X-Google-Smtp-Source: AA6agR7m07VS3Be/iYydYkhiP8Xno/hQBOsXUmOmAGAxo6VkG12bqKa7v6wZH3ZWuH5OeB4fgQPA1A== X-Received: by 2002:a05:6402:51cb:b0:448:3f0c:4085 with SMTP id r11-20020a05640251cb00b004483f0c4085mr35639341edd.170.1662403814054; Mon, 05 Sep 2022 11:50:14 -0700 (PDT) Received: from localhost (62-165-236-110.pool.digikabel.hu. [62.165.236.110]) by smtp.gmail.com with ESMTPSA id b23-20020aa7d497000000b0044ec3285b23sm290975edr.58.2022.09.05.11.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 11:50:13 -0700 (PDT) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH 2/5] test-parse-options.c: don't use for loop initial declaration Date: Mon, 5 Sep 2022 20:50:04 +0200 Message-Id: <20220905185007.9042-3-szeder.dev@gmail.com> X-Mailer: git-send-email 2.37.3.989.g4c3dfb3304 In-Reply-To: <20220905185007.9042-1-szeder.dev@gmail.com> References: <20220819160411.1791200-1-szeder.dev@gmail.com> <20220905185007.9042-1-szeder.dev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We would like to eventually use for loop initial declarations in our codebase, but we are not there yet. Signed-off-by: SZEDER Gábor --- t/helper/test-parse-options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c index aa0ad45851..9fe8ce66cb 100644 --- a/t/helper/test-parse-options.c +++ b/t/helper/test-parse-options.c @@ -195,7 +195,8 @@ int cmd__parse_options(int argc, const char **argv) static void print_args(int argc, const char **argv) { - for (int i = 0; i < argc; i++) + int i; + for (i = 0; i < argc; i++) printf("arg %02d: %s\n", i, argv[i]); } From patchwork Mon Sep 5 18:50:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 12966429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60F0BECAAD3 for ; Mon, 5 Sep 2022 18:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232263AbiIESuX (ORCPT ); Mon, 5 Sep 2022 14:50:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231981AbiIESuS (ORCPT ); Mon, 5 Sep 2022 14:50:18 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B6A22715C for ; Mon, 5 Sep 2022 11:50:17 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id kk26so18646997ejc.11 for ; Mon, 05 Sep 2022 11:50:16 -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; bh=iTDul9hY7q0ttDUoDwJ1eN9GNiXREVuYiuBFfrgXw6E=; b=Z0XYWhZY4szyLwbjpBYcAb9vI1Kg3maav8NiQPBV6Y/3D2sYNkba1dlroqqn4YWFZT Bd3YSSlr1fagG0J2Dae4VVemALhTKxGb9aSQSz0UXZVrOspXbgSBp/3vlCJB3v9LEDUR WjDg36NKbSOqz+MW/ddP34Ea5K5tlTRFHtC6jaXaSustmja5aDQGjYo4o6geagjlzgOe DSEJr/OvR4tr7gI3aVisPaSAF2iklyTcZHZ8Q5mZhY9j9w/4dMxAPXjXfA6Xc79rrS7P 4vz4TeaWPm8b+fkqvPTULPobb0Frnr/MWbu2pDhVyWaWDUspg98yRBcCeTfc4Nl0Sbn4 Y4Hw== 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; bh=iTDul9hY7q0ttDUoDwJ1eN9GNiXREVuYiuBFfrgXw6E=; b=Ylf3KOVODHR9qFD0fm7iivDm2HtbH4SHaZDCby757sP6xex1VKi1Tb61LKFcfa5owp 3Y02bYNhS+SYwg280I0PbGiWr5+n7r1itC2MCUNFetCOIqNY2Wm4stuBnDos4GVWoBFy wFYKGj7E6MQIQ6Q14uVHDPRYWIXpFJFJzyhL7gU0w1JTcsNaks6Occ+DboKDCjin3tUA fuFibMirNjglglp4bUXc35am7BqRoOHWtVIbj0kwxHASKN1a61K6z6dXqn6f+DdgB/08 Vj8WZnfBKJ6OiHawoY8guy1IQE6q8STmeI2zd7XNKZGnDzkba8PIUqqEXNEtc1PzPTqB dtcg== X-Gm-Message-State: ACgBeo1Wwl064ABKnRGr/Y/h2M0SKHDtx8cHk0ZQTZ8JEkE2ppvsvPOn u5+LxCvPMM5xOpMb1e8Kue5dXB/kN6o= X-Google-Smtp-Source: AA6agR5FWb4L/17Og4lAFE9qnNxKp5LctBZ8naHpCmAZsw0KBQR7FvWHHIAF2I6HrfSpUEbJgeY8rw== X-Received: by 2002:a17:906:eecb:b0:73c:5bcb:8eb3 with SMTP id wu11-20020a170906eecb00b0073c5bcb8eb3mr36870498ejb.284.1662403815575; Mon, 05 Sep 2022 11:50:15 -0700 (PDT) Received: from localhost (62-165-236-110.pool.digikabel.hu. [62.165.236.110]) by smtp.gmail.com with ESMTPSA id 10-20020a170906300a00b00738795e7d9bsm5357069ejz.2.2022.09.05.11.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 11:50:15 -0700 (PDT) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH 3/5] test-parse-options.c: fix style of comparison with zero Date: Mon, 5 Sep 2022 20:50:05 +0200 Message-Id: <20220905185007.9042-4-szeder.dev@gmail.com> X-Mailer: git-send-email 2.37.3.989.g4c3dfb3304 In-Reply-To: <20220905185007.9042-1-szeder.dev@gmail.com> References: <20220819160411.1791200-1-szeder.dev@gmail.com> <20220905185007.9042-1-szeder.dev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The preferred style is '!argc' instead of 'argc == 0'. Signed-off-by: SZEDER Gábor --- t/helper/test-parse-options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c index 9fe8ce66cb..506835521a 100644 --- a/t/helper/test-parse-options.c +++ b/t/helper/test-parse-options.c @@ -255,7 +255,7 @@ int cmd__parse_options_flags(int argc, const char **argv) argc = parse_options(argc, argv, NULL, test_flag_options, usage, PARSE_OPT_STOP_AT_NON_OPTION); - if (argc == 0 || strcmp(argv[0], "cmd")) { + if (!argc || strcmp(argv[0], "cmd")) { error("'cmd' is mandatory"); usage_with_options(usage, test_flag_options); } @@ -313,7 +313,7 @@ int cmd__parse_subcommand(int argc, const char **argv) argc = parse_options(argc, argv, NULL, test_flag_options, usage, PARSE_OPT_STOP_AT_NON_OPTION); - if (argc == 0 || strcmp(argv[0], "cmd")) { + if (!argc || strcmp(argv[0], "cmd")) { error("'cmd' is mandatory"); usage_with_options(usage, test_flag_options); } From patchwork Mon Sep 5 18:50:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 12966430 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8A5EC6FA83 for ; Mon, 5 Sep 2022 18:50:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232328AbiIESuZ (ORCPT ); Mon, 5 Sep 2022 14:50:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232269AbiIESuW (ORCPT ); Mon, 5 Sep 2022 14:50:22 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A10327CE5 for ; Mon, 5 Sep 2022 11:50:18 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id se27so18662420ejb.8 for ; Mon, 05 Sep 2022 11:50:18 -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; bh=Gh98o/9Qp9MKQDICn+5msJCqS0wERH2XWbsIsgVc+wQ=; b=V7vcT2yUFJhmWUPLnqlzHt0N1oarBAYF2Sngq2DIWle7prBDkNASvbowFxfEqhgEkA Yf+nqz6D8A855zjNPhBQg2ySxloW61qrdIBUM+G0TNRpShziMOuDJvCX17WQmyH6TNSE qJZrZa9DDnHquCrOkjqAhQBs4cOVEKKGkHngOKPjFYIXl80AZ/zhK3eI9wfZiHrU8nyH fB8RkFcAjQvqrxVlMIYIpgsQ9Ua5UmtaxqkgL+RYrMuVXQWJTpVrvaqqfnluYtlfDNfI BsF5K6JUeq07uk8/nRPtDqc+s3HJbuEEswWpZ8YuWoRqCPv+BO5vH8gLRDxjOzJ8kTKj NwUQ== 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; bh=Gh98o/9Qp9MKQDICn+5msJCqS0wERH2XWbsIsgVc+wQ=; b=z6L5j7UnDaYi1V/w7dT2A6w5Ek1WYFb23/WRdssFQsaAQn5Pr3cIpn1o6jkxXKRofx rVXml1t3FJ0kGL1xkZ4bJv4iiB7tFd1uj/maPXpIxKIPwbFeLjm82xbu4aZjBULVSu7a 4MjOQShvW5zhfYfrXTJzNozTGnSMINJR5DC8A9zdqCZQiiu/GOFsJdcd7wP5urZ/Gj0r 7CRq4XlFU2oQOR4UnPRXpNVunjSv1ApSB2dPM0uZqkIGVHyB27ev9FokrcEoyHDkdILA thahO7g/Z6RkKLB0sp0KPMP+VnKpj+aTlb1r7pcXqdRUSd7TA8AV3BTtXZLxxSUQ6GSK u7Zg== X-Gm-Message-State: ACgBeo0gsaFk3Vb/Bub3hKMfBt0J7B6BnwexaOhT1mlRBw/fhBKsa/ql YcrUTs8zDxd/qjx73pE7AysMUbP7cK4= X-Google-Smtp-Source: AA6agR7CgQLxigVli4h4U9lVKafBgluC5XDIft4WsNjL5VYU3bldJ7MiaLy64g8ovLfTDvFulcExAw== X-Received: by 2002:a17:907:80d:b0:73d:a576:dfbd with SMTP id wv13-20020a170907080d00b0073da576dfbdmr36376887ejb.402.1662403817123; Mon, 05 Sep 2022 11:50:17 -0700 (PDT) Received: from localhost (62-165-236-110.pool.digikabel.hu. [62.165.236.110]) by smtp.gmail.com with ESMTPSA id 12-20020a170906318c00b0073923a68974sm5246154ejy.206.2022.09.05.11.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 11:50:16 -0700 (PDT) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH 4/5] notes: simplify default operation mode arguments check Date: Mon, 5 Sep 2022 20:50:06 +0200 Message-Id: <20220905185007.9042-5-szeder.dev@gmail.com> X-Mailer: git-send-email 2.37.3.989.g4c3dfb3304 In-Reply-To: <20220905185007.9042-1-szeder.dev@gmail.com> References: <20220819160411.1791200-1-szeder.dev@gmail.com> <20220905185007.9042-1-szeder.dev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 'git notes' has a default operation mode, but when invoked without a subcommand it doesn't accept any arguments (although the 'list' subcommand implementing the default operation mode does accept arguments). The condition checking this ended up a bit awkward, so let's make it clearer. Signed-off-by: SZEDER Gábor --- builtin/notes.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index 42cbae4659..60410af572 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -995,7 +995,7 @@ static int get_ref(int argc, const char **argv, const char *prefix) int cmd_notes(int argc, const char **argv, const char *prefix) { const char *override_notes_ref = NULL; - parse_opt_subcommand_fn *fn = list; + parse_opt_subcommand_fn *fn = NULL; struct option options[] = { OPT_STRING(0, "ref", &override_notes_ref, N_("notes-ref"), N_("use notes from ")), @@ -1015,9 +1015,12 @@ int cmd_notes(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); argc = parse_options(argc, argv, prefix, options, git_notes_usage, PARSE_OPT_SUBCOMMAND_OPTIONAL); - if (fn == list && argc && strcmp(argv[0], "list")) { - error(_("unknown subcommand: %s"), argv[0]); - usage_with_options(git_notes_usage, options); + if (!fn) { + if (argc) { + error(_("unknown subcommand: %s"), argv[0]); + usage_with_options(git_notes_usage, options); + } + fn = list; } if (override_notes_ref) { From patchwork Mon Sep 5 18:50:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 12966431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6C92ECAAD5 for ; Mon, 5 Sep 2022 18:50:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232269AbiIESua (ORCPT ); Mon, 5 Sep 2022 14:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232296AbiIESuZ (ORCPT ); Mon, 5 Sep 2022 14:50:25 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB4D227CED for ; Mon, 5 Sep 2022 11:50:20 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id u9so18691194ejy.5 for ; Mon, 05 Sep 2022 11:50:20 -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; bh=61K8GDvz2r6pU8GbYTRiOQUnd/QhKTuHUZ2QZFEDIz8=; b=Kjtol8OV0qpDHtVB/SJ3IF47YCurE0Jo6pAKprJ/1BUoIbkxV4QGI7Vye4/WVymzyK K969xZ0DXgqRfrfitrOY//7eGsUgdjU/u1Xk8hQ1neUat8i8xPjVrxP+5YyZYYS77uL3 ocSGDLci6NQim1NAIXVJuWhrxfDtRHjBnfbDC33exIJiyJIyHILZfv74Z1Rycy4/NAzD mX0eRarHj6+6ZL4nwOiNlw/124dLlWnoRFqxeIvVg/tckRxK/9OCYKnw+5TMfZmOSb4j n9CXreYK5DTJAGNpMELmRGEI9BgPUXCzjz/aZzvMLkh3EyCJhbPqEym1fxwY5lGdN/Xv 1Dmg== 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; bh=61K8GDvz2r6pU8GbYTRiOQUnd/QhKTuHUZ2QZFEDIz8=; b=4i5WNG+j5D+2B1Jh3RmXj48UUORUAlZjL0CVl7JfwnnkzGTsJljCvhEMIbyRYf2KQu 4pJKlTisbt3pyi6O3Yxhr1YkK4dELnB8e9uYUWbzbhPRQCOp1j1N7uww7Fz+Oqx/RjLK N8r1P3Mh20Zvd+cpCl6VI5d1ZJCWMIrtTFerCEMLT5FNNKoC6mgDcFWaoHSFSCu/W6UZ 5Ke8bTJgzvIp6v9nWWIrzFz1II1CyWnjkKOgZGRMINNDj8W5VjqgVbTaA5vD5k5/n1fK 5DP9OnSGnfZp9k3GwUxniGJ/Ea/V2MjpIdF4mjQMtkUiv3oGcXpFX6z8vfV6g16jcn8F whaQ== X-Gm-Message-State: ACgBeo0VSuCoMO+yLaeqGJX7YKm+hmwbr61atlVMfaDnnxRzxsYpcez7 YD0Z1ZsR7KCNyQV2KIpV7yxLQ7hUing= X-Google-Smtp-Source: AA6agR6DH7g4TFDVoZFZDFMnJggZ/PBJO4HPe46A5ZY3/EhONaOEfQAD5+KniiTjLGE3rV3a65cSWQ== X-Received: by 2002:a17:906:8462:b0:741:6003:71e4 with SMTP id hx2-20020a170906846200b00741600371e4mr29027562ejc.170.1662403818624; Mon, 05 Sep 2022 11:50:18 -0700 (PDT) Received: from localhost (62-165-236-110.pool.digikabel.hu. [62.165.236.110]) by smtp.gmail.com with ESMTPSA id ky10-20020a170907778a00b0073d68d2fc29sm5339524ejc.218.2022.09.05.11.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 11:50:18 -0700 (PDT) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH 5/5] notes, remote: show unknown subcommands between `' Date: Mon, 5 Sep 2022 20:50:07 +0200 Message-Id: <20220905185007.9042-6-szeder.dev@gmail.com> X-Mailer: git-send-email 2.37.3.989.g4c3dfb3304 In-Reply-To: <20220905185007.9042-1-szeder.dev@gmail.com> References: <20220819160411.1791200-1-szeder.dev@gmail.com> <20220905185007.9042-1-szeder.dev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Update the "unknown subcommand" error message in 'git notes' and 'git remote' to wrap the offending argument between `', to make it consistent with the "unknown switch/option/subcommand" error messages in parse-options. Signed-off-by: SZEDER Gábor --- builtin/notes.c | 2 +- builtin/remote.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index 60410af572..be51f69225 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -1017,7 +1017,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix) PARSE_OPT_SUBCOMMAND_OPTIONAL); if (!fn) { if (argc) { - error(_("unknown subcommand: %s"), argv[0]); + error(_("unknown subcommand: `%s'"), argv[0]); usage_with_options(git_notes_usage, options); } fn = list; diff --git a/builtin/remote.c b/builtin/remote.c index 272c7b8d9e..07117e4c9a 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1768,7 +1768,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix) return !!fn(argc, argv, prefix); } else { if (argc) { - error(_("unknown subcommand: %s"), argv[0]); + error(_("unknown subcommand: `%s'"), argv[0]); usage_with_options(builtin_remote_usage, options); } return !!show_all();