From patchwork Tue Apr 6 14:00:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12185343 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F227DC433B4 for ; Tue, 6 Apr 2021 14:00:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C978A61399 for ; Tue, 6 Apr 2021 14:00:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344834AbhDFOA5 (ORCPT ); Tue, 6 Apr 2021 10:00:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234998AbhDFOA4 (ORCPT ); Tue, 6 Apr 2021 10:00:56 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5873FC061756 for ; Tue, 6 Apr 2021 07:00:48 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id o20-20020a05600c4fd4b0290114265518afso4562189wmq.4 for ; Tue, 06 Apr 2021 07:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ktwW0UL4la9TjUNgfJsFb8356bjPWIHqOPL3YdaolNU=; b=Go5x8NV1fAkbvl4BCB59kD1Gid/ZJ7rqsFbMOlz0YgQjQr+pdtL9GHaqA385aAVJ9h X+xm1ziunvaTDxrv9HuctAabzTPQ+OyFMM+g0gXRmRw6HtymrQVCUIiPhzJpqdqIlGdC vgyP1tO2FAwFrwHkvYzUsTJHmDWIvoQMTGpPb84o0EgcRmHEZgTMWHaI4EJgpFzM4HCv 2YCYtp9YJXjLNKPozle+xzXsRFw+UZh/VsI3c0ggvSf17DLfISeMDxj3B6NSANgeRbHJ Nx8JPXD3aTASXFjeAOF5uBC7tiXOTn6yWQCIQASJvPfXrifmqMQWcmmnrx8NuMJS3PfM JQ4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ktwW0UL4la9TjUNgfJsFb8356bjPWIHqOPL3YdaolNU=; b=n0U4IP8caO6I5AWF44l2e4xmM8ZuDb5xDivSLW6Ejg+HU7MzR/Hmi9OP/mwkxq3QGm nXXwpdAQdxpyf1xYbR2vdTybURknnr4ozv7SUwm3QUKBMhp+RtAqHZRfSfMG6QKNIQVw zrbTt32/XfnhjIqC7izd5gg7qR4nmVAwhapyXHlEkrs7sfV9Q6FkJUI5OTPjsFxW1D9+ CBCWA76X78aOulpS74QliXUxSoKuU5EHABQLY33F4kT8dwN1w2DO21SdmhIES7AeuOO3 aQ6P+0M2Nw0TpG7EpcjUIGq9VBsgE/jze0pg+bz7t3KpBHlHB3OHoegTOyHZZMB0g5FY 5Mww== X-Gm-Message-State: AOAM531zNiI25ccAKlAEghtESZ6kNOjHV3iTKeKgOOUQJDxuuet3gVfF JSZCaicp2jvRFtWWBvBq0pIAcS5Of9U= X-Google-Smtp-Source: ABdhPJxqc7JQvG/b+NhGlt33D5ASBMPTP7NrFD3m191pNn/DZdiMXKZ8dguWI1Xj8+LeGA1DugFnBg== X-Received: by 2002:a1c:7515:: with SMTP id o21mr4324888wmc.90.1617717646790; Tue, 06 Apr 2021 07:00:46 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id h6sm20029696wrr.21.2021.04.06.07.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 07:00:46 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 1/3] git-send-email: test full --validate output Date: Tue, 6 Apr 2021 16:00:35 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.527.g9b8f7de2547 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the tests that grep substrings out of the output to use a full test_cmp, in preparation for improving the output. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t9001-send-email.sh | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 1a1caf8f2ed..74225e3dc7a 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -422,8 +422,12 @@ test_expect_success $PREREQ 'reject long lines' ' --smtp-server="$(pwd)/fake.sendmail" \ --transfer-encoding=8bit \ $patches longline.patch \ - 2>errors && - grep longline.patch errors + 2>actual && + cat >expect <<-\EOF && + fatal: longline.patch: 35: patch contains a line longer than 998 characters + warning: no patches were sent + EOF + test_cmp expect actual ' test_expect_success $PREREQ 'no patch was sent' ' @@ -527,9 +531,13 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" ' --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ --validate \ - longline.patch 2>err && + longline.patch 2>actual && test_path_is_file my-hooks.ran && - grep "rejected by sendemail-validate" err + cat >expect <<-\EOF && + fatal: longline.patch: rejected by sendemail-validate hook + warning: no patches were sent + EOF + test_cmp expect actual ' test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" ' @@ -540,9 +548,13 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" ' --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ --validate \ - longline.patch 2>err && + longline.patch 2>actual && test_path_is_file my-hooks.ran && - grep "rejected by sendemail-validate" err + cat >expect <<-\EOF && + fatal: longline.patch: rejected by sendemail-validate hook + warning: no patches were sent + EOF + test_cmp expect actual ' for enc in 7bit 8bit quoted-printable base64 From patchwork Tue Apr 6 14:00:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12185345 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3872C43461 for ; Tue, 6 Apr 2021 14:00:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 82B3861396 for ; Tue, 6 Apr 2021 14:00:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344837AbhDFOA6 (ORCPT ); Tue, 6 Apr 2021 10:00:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344832AbhDFOA5 (ORCPT ); Tue, 6 Apr 2021 10:00:57 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60D33C06174A for ; Tue, 6 Apr 2021 07:00:49 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id b133-20020a1c678b0000b02901231346381dso428168wmc.0 for ; Tue, 06 Apr 2021 07:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xn7DgsophynFP8y+sziGcvzzoV1c0RbQ53IurH8K6uY=; b=l68sBgNQ4SGRtmst6Myq+CnfJvyRjxchwntpk/vF7MXL46Whl60GsG6+oZZC7kOKmH VM8VcYqe+KqEPNVGhcxlnCYi1OsTpm2ilSS5nDYqApgYmi3BTD6D83D2O1fsPJiC9mlS aeM07P+fQiFhXFjHrDCXY134r/y5IEnWDNT+LZu7TR+YWbSH2qYarAoU4EfUtvNIG6Ej UY3sF86TnIqVEZR/2MUt9pL97LlA2r8CETj7B3/d/S9Uf1NlJFouSGy2nvn6dI/mg8uW yeKy97m5XRHwZsPgU9pTA0tHIXRYqxaVACf/ACICvfoVBjrC4zmSoYEhFsYlyZZufdgn lhJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xn7DgsophynFP8y+sziGcvzzoV1c0RbQ53IurH8K6uY=; b=EczBB1XiHum3cWXk1FPMpIBpI3BgUYhJfGf3dldNPYIgsVgf1drtivQRzW9jaR6gDZ BrmyJP8HP6p1Rur3C8LiL+KKrG4I9o5qli03NnxE1K3w5QNMaybU2676+SLNlEdhLvC3 H2mmLoNuvrr4gJJ6ubcDxeoeKcgJCXOhk+yXOUHhXwwEogNejGFT8d1olu5+l97Q+4Us jrVecd+13XGXoIY5l6Bu480YXOIX9fskr4Dx/F2nDpX86OZeJ9vj/M20GtO/xFxuXyX9 B1w+Jvwk/wfOhy+ykwWpsBFGXLGCA1NH5KSDVXeIlT3fAtVXNOLJaM8+Zq8Cykme0rmp pktQ== X-Gm-Message-State: AOAM531GiIyWstzgZc+jUs0BmY3VqmBo626ES7fmbxVV2PlMePEcPqxt UzLh32fGUgxRyt60Fu1OGOymhTJo+0xK4A== X-Google-Smtp-Source: ABdhPJwHOJnZYauNjdCc+SIB2fI2CZOQClEmQfy3KaCPQJEliIDdgdCZs3VqVDLoxVsP98AZhKalbw== X-Received: by 2002:a7b:c24e:: with SMTP id b14mr4300891wmj.73.1617717647619; Tue, 06 Apr 2021 07:00:47 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id h6sm20029696wrr.21.2021.04.06.07.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 07:00:47 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 2/3] git-send-email: refactor duplicate $? checks into a function Date: Tue, 6 Apr 2021 16:00:36 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.527.g9b8f7de2547 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Refactor the duplicate checking of $? into a function. There's an outstanding series[1] wanting to add a third use of system() in this file, let's not copy this boilerplate anymore when that happens. 1. http://lore.kernel.org/git/87y2esg22j.fsf@evledraar.gmail.com Signed-off-by: Ævar Arnfjörð Bjarmason --- git-send-email.perl | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 6893c8e5808..2dd48621759 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -212,22 +212,31 @@ sub format_2822_time { my $multiedit; my $editor; +sub system_or_msg { + my ($args, $msg) = @_; + system(@$args); + my $signalled = $? & 127; + my $exit_code = $? >> 8; + return unless $signalled or $exit_code; + + return sprintf(__("failed to run command %s, died with code %d"), + "@$args", $exit_code); +} + +sub system_or_die { + my $msg = system_or_msg(@_); + die $msg if $msg; +} + sub do_edit { if (!defined($editor)) { $editor = Git::command_oneline('var', 'GIT_EDITOR'); } + my $die_msg = __("the editor exited uncleanly, aborting everything"); if (defined($multiedit) && !$multiedit) { - for (@_) { - system('sh', '-c', $editor.' "$@"', $editor, $_); - if (($? & 127) || ($? >> 8)) { - die(__("the editor exited uncleanly, aborting everything")); - } - } + system_or_die(['sh', '-c', $editor.' "$@"', $editor, $_], $die_msg) for @_; } else { - system('sh', '-c', $editor.' "$@"', $editor, @_); - if (($? & 127) || ($? >> 8)) { - die(__("the editor exited uncleanly, aborting everything")); - } + system_or_die(['sh', '-c', $editor.' "$@"', $editor, @_], $die_msg); } } @@ -698,9 +707,7 @@ sub is_format_patch_arg { if ($validate) { foreach my $f (@files) { unless (-p $f) { - my $error = validate_patch($f, $target_xfer_encoding); - $error and die sprintf(__("fatal: %s: %s\nwarning: no patches were sent\n"), - $f, $error); + validate_patch($f, $target_xfer_encoding); } } } @@ -1952,11 +1959,13 @@ sub validate_patch { chdir($repo->wc_path() or $repo->repo_path()) or die("chdir: $!"); local $ENV{"GIT_DIR"} = $repo->repo_path(); - $hook_error = "rejected by sendemail-validate hook" - if system($validate_hook, $target); + $hook_error = system_or_msg([$validate_hook, $target]); chdir($cwd_save) or die("chdir: $!"); } - return $hook_error if $hook_error; + if ($hook_error) { + die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" . + "warning: no patches were sent\n"), $fn); + } } # Any long lines will be automatically fixed if we use a suitable transfer @@ -1966,7 +1975,9 @@ sub validate_patch { or die sprintf(__("unable to open %s: %s\n"), $fn, $!); while (my $line = <$fh>) { if (length($line) > 998) { - return sprintf(__("%s: patch contains a line longer than 998 characters"), $.); + die sprintf(__("fatal: %s: %d: patch contains a line longer than 998 characters\n" . + "warning: no patches were sent\n"), + $fn, $.); } } } From patchwork Tue Apr 6 14:00:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12185347 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AEB2C43460 for ; Tue, 6 Apr 2021 14:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2E3E613BD for ; Tue, 6 Apr 2021 14:00:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344839AbhDFOA7 (ORCPT ); Tue, 6 Apr 2021 10:00:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234998AbhDFOA6 (ORCPT ); Tue, 6 Apr 2021 10:00:58 -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 39554C06174A for ; Tue, 6 Apr 2021 07:00:50 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id a76so4218857wme.0 for ; Tue, 06 Apr 2021 07:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L30JOyTUDiG33bs18mptbYSAy0GY7nwlxVrpycnRwm8=; b=CC6QHdridhFYkD//l2j9Lr7LRwdBRWKfZCM6x0W5GMElQUxIt6Ul/YKd8f4rJbosjR PUbmAYvqPvMxq4FQRKa/adZj8OVmhuB4bPZBtE21cI49Fd/SOG3MQnjyAV9tT4wq+QAD 5XWgdcKELlpT/6LbnzlAneAZDPYzFe69GMNHFRySEzOpFhsh9EdUoqY8f2g5igBI5bc1 eTrFwe+I/N1KKrcEmabXVM/+rPtsUTqXU4L2L+JbFtCR+GGOn7gGKkW1c8lgMqW5uy1+ wKiia1IKVGurwKb7I9oJeZcOpxq7X2wPIetdMuz0Al/P24oMyH/mSzWZlGZOPDaJcKGX WEGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L30JOyTUDiG33bs18mptbYSAy0GY7nwlxVrpycnRwm8=; b=SuAWwGzaiG3HKzz81Pg//RN5sJgz6UvoMKntv2wlrmctczb7MbxC51Tz4IVNFQgInS R+RHam6J11FvPsoDcIA71uzvTjq4PQzyqPer1piuOl5jkwpHmn/nCnpns83Kf620k1YN a6eDV0v+HyJnRIq8bcAhrYqGs1h+QpqSphy3dqzHZWaFfL2Qyy4LiIM6g2p7mz13wb/4 WvpW455G2YiTL9mYRWXSNHy26OOSGae5Qq6Depsf9naZ7fB4fdh6BEsbYrT80LgXXdX+ jVYcH5cRhP2n/HY0ZhjIaTo50t/dnmTqzvsJw11XUTJ+l20swNlnKqXmUok2/B14+rop jClQ== X-Gm-Message-State: AOAM531T1tPmMxZjNlGlhgKVQJKuyiYlEndmnkbtVZ7rPUjJJdNTB/zF 2vHVAp96sW7eKZi+zH0hioSTbguTSztqoQ== X-Google-Smtp-Source: ABdhPJwcQsetEStj9fdj7Iy6bTi3vzR5xq/DugZ21dWUwseh3EVBVnGupGiOpBqalM8Gd0qm1cAgFQ== X-Received: by 2002:a05:600c:228d:: with SMTP id 13mr4399423wmf.49.1617717648618; Tue, 06 Apr 2021 07:00:48 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id h6sm20029696wrr.21.2021.04.06.07.00.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 07:00:47 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 3/3] git-send-email: improve --validate error output Date: Tue, 6 Apr 2021 16:00:37 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.527.g9b8f7de2547 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Improve the output we emit on --validate error to: * Say "FILE:LINE" instead of "FILE: LINE", to match "grep -n", compiler error messages etc. * Don't say "patch contains a" after just mentioning the filename, just leave it at "FILE:LINE: is longer than[...]. The "contains a" sounded like we were talking about the file in general, when we're actually checking it line-by-line. * Don't just say "rejected by sendemail-validate hook", but combine that with the system_or_msg() output to say what exit code the hook died with. I had an aborted attempt to make the line length checker note all lines that were longer than the limit. I didn't think that was worth the effort, but I've left in the testing change to check that we die as soon as we spot the first long line. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-send-email.perl | 12 ++++++------ t/t9001-send-email.sh | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 2dd48621759..175da07d946 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -219,8 +219,8 @@ sub system_or_msg { my $exit_code = $? >> 8; return unless $signalled or $exit_code; - return sprintf(__("failed to run command %s, died with code %d"), - "@$args", $exit_code); + return sprintf(__("fatal: command '%s' died with exit code %d"), + $args->[0], $exit_code); } sub system_or_die { @@ -1964,7 +1964,8 @@ sub validate_patch { } if ($hook_error) { die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" . - "warning: no patches were sent\n"), $fn); + "%s\n" . + "warning: no patches were sent\n"), $fn, $hook_error); } } @@ -1975,9 +1976,8 @@ sub validate_patch { or die sprintf(__("unable to open %s: %s\n"), $fn, $!); while (my $line = <$fh>) { if (length($line) > 998) { - die sprintf(__("fatal: %s: %d: patch contains a line longer than 998 characters\n" . - "warning: no patches were sent\n"), - $fn, $.); + die sprintf(__("fatal: %s:%d is longer than 998 characters\n" . + "warning: no patches were sent\n"), $fn, $.); } } } diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 74225e3dc7a..65b30353719 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -415,7 +415,11 @@ test_expect_success $PREREQ 'reject long lines' ' z512=$z64$z64$z64$z64$z64$z64$z64$z64 && clean_fake_sendmail && cp $patches longline.patch && - echo $z512$z512 >>longline.patch && + cat >>longline.patch <<-EOF && + $z512$z512 + not a long line + $z512$z512 + EOF test_must_fail git send-email \ --from="Example " \ --to=nobody@example.com \ @@ -424,7 +428,7 @@ test_expect_success $PREREQ 'reject long lines' ' $patches longline.patch \ 2>actual && cat >expect <<-\EOF && - fatal: longline.patch: 35: patch contains a line longer than 998 characters + fatal: longline.patch:35 is longer than 998 characters warning: no patches were sent EOF test_cmp expect actual @@ -533,15 +537,17 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" ' --validate \ longline.patch 2>actual && test_path_is_file my-hooks.ran && - cat >expect <<-\EOF && + cat >expect <<-EOF && fatal: longline.patch: rejected by sendemail-validate hook + fatal: command '"'"'$(pwd)/my-hooks/sendemail-validate'"'"' died with exit code 1 warning: no patches were sent EOF test_cmp expect actual ' test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" ' - test_config core.hooksPath "$(pwd)/my-hooks" && + hooks_path="$(pwd)/my-hooks" && + test_config core.hooksPath "$hooks_path" && test_when_finished "rm my-hooks.ran" && test_must_fail git send-email \ --from="Example " \ @@ -550,8 +556,9 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" ' --validate \ longline.patch 2>actual && test_path_is_file my-hooks.ran && - cat >expect <<-\EOF && + cat >expect <<-EOF && fatal: longline.patch: rejected by sendemail-validate hook + fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1 warning: no patches were sent EOF test_cmp expect actual