From patchwork Sun Mar 22 00:55:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11451469 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E43331893 for ; Sun, 22 Mar 2020 00:56:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C247420754 for ; Sun, 22 Mar 2020 00:56:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b6/7gw9h" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728237AbgCVA4D (ORCPT ); Sat, 21 Mar 2020 20:56:03 -0400 Received: from mail-pf1-f181.google.com ([209.85.210.181]:35403 "EHLO mail-pf1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727296AbgCVA4C (ORCPT ); Sat, 21 Mar 2020 20:56:02 -0400 Received: by mail-pf1-f181.google.com with SMTP id u68so5509430pfb.2 for ; Sat, 21 Mar 2020 17:56:01 -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=Vx9MM0np547+VJB1b/JbwD5ErtmMbJfcaQa/9CDZtKA=; b=b6/7gw9hEcw5BmDxSeWVG/Vdz3DxaE+84E0FFWDKol4tHtlESr2N1QiXQW8hnitjJc PSA+EUzg2K77yT8OFlo4ipNOD7etjplHtqKZcE5LeUAAYORfgnWtk4eNyGvAeAkQXodt IvLAZSR9lFyF2Wma7t/OA0fDOaKOEpQnrQ37jem2Yk8RCxlq+8SRkQm1cO4BIOjt9znE VqA4jjaA+TKEJNQ1k9rLzTO/gj99cS3Y5Km3eN9DF0b8OxB9shpgJNrfmrNhg2wOX2xg lB5/kBch5eX3yTHa9lG48Nb8U2ApCgnlU4v4DLYyQZ1YZUpWYMG+FHeQwFxu/GskHKSM vfaw== 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=Vx9MM0np547+VJB1b/JbwD5ErtmMbJfcaQa/9CDZtKA=; b=hMPPQ9JYQvhPPr+jFD+L98PxgDrRj3XkM3Oo5G0dO9bvx6VDLCyX8xJLlQ9JYymKp+ BM95HfZ3efYSkrfa74X+YFvxF63/WC1dOGNikoZfIZTIEw0vlNK7z0hk8su1zXRpl7mW gpwsU6MngJMT2Jv0xslnPnz/DQG8ja/Aj5PXGrVGpUp95yJGkrX4zPlqKyKgwIBZqI8F hMiZ06y39OKYh7F8DhClmM4UAYlZCPkcGIqmE9G9itVdBK4mVMifSg5x543PTUdA5eVT Ir0PeXPMtvujJO9Y5SoyKPSFB9yBG+gTRpEj+tkaaXpShCAyMbjvPMNhdPXm6AuOW0S5 h3Fg== X-Gm-Message-State: ANhLgQ2IoiV595TPsRInmhOb3MTCwAuKKN363ijnp/OYf8IKsbernQHa hoWA4pczwZYIeHtW2yVmmjbTaYmx X-Google-Smtp-Source: ADFU+vsQVKCJSXcqEeOdv/B2RFK5SfP1gd9x3LYhqG13vsKYByz5AkNdWEIRyxBMD7AkMJ8uSVFV4Q== X-Received: by 2002:aa7:95ae:: with SMTP id a14mr16625000pfk.164.1584838560758; Sat, 21 Mar 2020 17:56:00 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.55.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:00 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v2 1/8] t4061: use POSIX compliant regex(7) Date: Sun, 22 Mar 2020 07:55:11 +0700 Message-Id: <288e343d09dd375bbb61ba97858f518b431d0b1d.1584838148.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org BRE interprets `+` literally, and `\+` is undefined for POSIX BRE, from: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03_02 > The interpretation of an ordinary character preceded > by an unescaped ( '\\' ) is undefined, except for: > - The characters ')', '(', '{', and '}' > - The digits 1 to 9 inclusive > - A character inside a bracket expression This test is failing with busybox sed, the default sed of Alpine Linux We have 2 options here: - Using literal `+` because BRE will interpret it as-is, or - Using character class `[+]` to defend against a sed that expects ERE ERE-expected sed is theoretical at this point, but we haven't found it, yet. And, we may run into other problems with that sed. Let's go with first option and fix it later if that sed could be found. Signed-off-by: Đoàn Trần Công Danh --- t/t4061-diff-indent.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh index 2affd7a100..0f7a6d97a8 100755 --- a/t/t4061-diff-indent.sh +++ b/t/t4061-diff-indent.sh @@ -17,7 +17,7 @@ compare_diff () { # Compare blame output using the expectation for a diff as reference. # Only look for the lines coming from non-boundary commits. compare_blame () { - sed -n -e "1,4d" -e "s/^\+//p" <"$1" >.tmp-1 + sed -n -e "1,4d" -e "s/^+//p" <"$1" >.tmp-1 sed -ne "s/^[^^][^)]*) *//p" <"$2" >.tmp-2 test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 } From patchwork Sun Mar 22 00:55:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11451471 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1AFE9159A for ; Sun, 22 Mar 2020 00:56:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED17A20754 for ; Sun, 22 Mar 2020 00:56:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lK+6+w/w" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728255AbgCVA4G (ORCPT ); Sat, 21 Mar 2020 20:56:06 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:33208 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728231AbgCVA4D (ORCPT ); Sat, 21 Mar 2020 20:56:03 -0400 Received: by mail-pl1-f193.google.com with SMTP id g18so4252074plq.0 for ; Sat, 21 Mar 2020 17:56:03 -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=4r5h7d5t7HeFYI+CcFzH9VHuXdX2rvucddR1DC5dXec=; b=lK+6+w/wkBP9Gsej/GlHbWJraPPIVwkC7AHwRrxzkf01HahClKQ9N44taxnjGNKADT BbhSkW2JycoGKYozYQOG17KNitii2uiNIle0GF0yIGU91ShzFUIo+D8vdFb14gAqEEnu NBk9xUSJ57LYPLCjz3uCI78lhqS8Cc93lBtFoReU3bxY+ncMYIdUMUlZ8abQ6RSykDl5 HnjQJQMwoEk4fRzSxh21dB6DKSGc6vA7WvtW5hAbXLieFW2Vgz9Fm56RT04ye8yLspwj lTJBWoheqNWHfuIwt9emFKEm7t91XDqx7o14uUBsDcGE6IunQBMDLGQEdo7uiqmwKSVi hWNQ== 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=4r5h7d5t7HeFYI+CcFzH9VHuXdX2rvucddR1DC5dXec=; b=MluDW7EEbo76C9D3x0064w83Wj54ZNqV2ec9hHJELteMmMkx6mz9AYB9wQR/2XKDoO c5qGeYC4AjpO29MIKPCzayIh0c9oVsccd+ZZxGrw7Zaqo5J7s6Ab3AlOiczcwr+X8Fho FyVIlE6DxVjsuLpOjrsbgDQVLAkKF7nGRI1MickYKfh6PcNQlQfYWpZxshoiQLVF43et 8cqqH2o9n/SJ6MNmH7jqcVfWRlz9is7WwoX2pTP7eHjqzztRUvPVBBlu07LLfffYbV7I /sZZCyjmyOxB5/hO7FG4O2Oz0v92bD8U0uBFJ+C33oochoAhglah1sr6UzLpnc2ed1Vs Tbxg== X-Gm-Message-State: ANhLgQ0lWpB7PLxWl1oi65An1XsTQLMTbOoTOEMTyQFhQXrxDzDRuxAS ngvFZc2jx0C8w2X0dYZriQDuw/EU X-Google-Smtp-Source: ADFU+vtpNezxUMPTDsUkUy9/KD5Old5vboyjpXN/Rda+Z9xmSrVInRSSO3DHIxOHfgKTgTiWGJuK1w== X-Received: by 2002:a17:90a:2a06:: with SMTP id i6mr15590836pjd.99.1584838562468; Sat, 21 Mar 2020 17:56:02 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.56.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:01 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v2 2/8] test-lib-functions: test_cmp: eval $GIT_TEST_CMP Date: Sun, 22 Mar 2020 07:55:12 +0700 Message-Id: <9d3823e84971e7f96b4f502d1f5ff54c70c59144.1584838148.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Shell recognises first non-assignment token as command name. With /bin/sh linked to either /bin/bash or /bin/dash, `cd t/perf && ./p0000-perf-lib-sanity.sh -d -i -v` reports: > test_cmp:1: command not found: diff -u Using `eval` to unquote $GIT_TEST_CMP as same as precedence in `git_editor`. Signed-off-by: Đoàn Trần Công Danh --- t/test-lib-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 352c213d52..ab0e47ae17 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -905,7 +905,7 @@ test_expect_code () { # - not all diff versions understand "-u" test_cmp() { - $GIT_TEST_CMP "$@" + eval "$GIT_TEST_CMP" '"$@"' } # Check that the given config key has the expected value. From patchwork Sun Mar 22 00:55:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11451473 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75D781668 for ; Sun, 22 Mar 2020 00:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5407020754 for ; Sun, 22 Mar 2020 00:56:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LO9y6Nnp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728251AbgCVA4F (ORCPT ); Sat, 21 Mar 2020 20:56:05 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:46555 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727296AbgCVA4F (ORCPT ); Sat, 21 Mar 2020 20:56:05 -0400 Received: by mail-pf1-f194.google.com with SMTP id q3so966275pff.13 for ; Sat, 21 Mar 2020 17:56:04 -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=eK3AzpJ6LJHCUC9U7ugVkSvr3imte1dGz4l9yKLPRUI=; b=LO9y6NnpczL3eloMJN6i0WRl3ABUpWXD1iWCSI787vmBiTcSt/4OTHn2KkwnbbZbnN XV6li3tsSzIJIrYOdKDdIQ6qbrD59cm8cvIQMbB0QhQ4FeeBv1ehIET8XBIxlEl02Epl XaQwhOs4q5TPnDyFTUBXrpNksWtbBwShfBcz0Dd4fenVQCkPHW7yd1N9qvrgaz/r36MW JVTur9nVIlxDy6LJtaKlqT3O9tgpMDEAsc1b78o8Qv+2DVt66EdR8ONGnlVFHASq2CPq o03ncU2RMYNYkmgSWLPEy356XyL6n4pkjGdr+R3hPt9tkERacG0vkgRh0v3j0MXENFfT SW/g== 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=eK3AzpJ6LJHCUC9U7ugVkSvr3imte1dGz4l9yKLPRUI=; b=dRAucwq10RbNHn0zc3KFJhrlCu2sCyrmn0M0tQ9KYPbMsOMu5T6KVEieWoQcCBJzfZ 8u+IVRDTz1R1BaxW71i0XVkVMPCvlZwgz45j6Y+204HWfrbj7iYCXEqzC/p1AxK5c+dd fr0M5g9yAC/UxIgwcW0dnC0Y+tX261SFkjUdaQ2lwTPBIS9YnZ7jROJUk97HoH7j/lhH ucJubq9wew6IOlzpl3MkO9PncVMI0/Bd5+NguBlTpkFisYtT9BkNCVOO0GntAyU6u35G cpAP8sOyx49t+a1KGEiJz6dKRJKV21PbS/EMXVeya52AqqioFz972T8kBk6HbLFLsIEi e54g== X-Gm-Message-State: ANhLgQ0aEUcPSRGsY54gyPL06jz+DxTIhio2Ty62iXMVL3RTKD/C8aCZ 59S+cKtj14ybZIBH19PqpMEziGuQ X-Google-Smtp-Source: ADFU+vsC+FDsugzaV5q+sAFrYI9nqQrQntUFFPFb/L1qi8/0k+ySdOw9QCvNHqLO2W7XIinTCv+Qxw== X-Received: by 2002:a62:880f:: with SMTP id l15mr17350566pfd.218.1584838563932; Sat, 21 Mar 2020 17:56:03 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.56.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:03 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v2 3/8] t5003: drop the subshell in test_lazy_prereq Date: Sun, 22 Mar 2020 07:55:13 +0700 Message-Id: <8e85b5c15c47e7c524226d10915e4ecb12b2c132.1584838148.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org test_lazy_prereq will be evaluated in a throw-away directory. Drop unnecessary subshell and mkdir. Signed-off-by: Đoàn Trần Công Danh --- t/t5003-archive-zip.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 106eddbd85..df1374a312 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -7,12 +7,8 @@ test_description='git archive --format=zip test' SUBSTFORMAT=%H%n test_lazy_prereq UNZIP_SYMLINKS ' - ( - mkdir unzip-symlinks && - cd unzip-symlinks && - "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip && - test -h symlink - ) + "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip && + test -h symlink ' check_zip() { From patchwork Sun Mar 22 00:55:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11451477 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB60E159A for ; Sun, 22 Mar 2020 00:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A905820754 for ; Sun, 22 Mar 2020 00:56:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MCCfcILW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728269AbgCVA4L (ORCPT ); Sat, 21 Mar 2020 20:56:11 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:36145 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728257AbgCVA4J (ORCPT ); Sat, 21 Mar 2020 20:56:09 -0400 Received: by mail-pf1-f194.google.com with SMTP id i13so5517652pfe.3 for ; Sat, 21 Mar 2020 17:56:09 -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=xhjB6OpE2jsvt0Qsr3VT+X0Amcl8TSJfdeWJ9T/KVuI=; b=MCCfcILWE3rdqd98mggBabtOZL5CnyYQscBmzUkTwZWrVgssn17KtA8z/PVee3vlw3 Sz8HQu/PXLlUJaznD/BdcFHvyxhgDpA4lIFBMoE/POu6sExl/+30/BI6z6KrlEzbZIyT VPGMbEjegDDnDS3Cu6Vxw2r6xDEkVOWn3Jv6+nV6zTy8pf1BNM19JBLU/Lku1Dvs8M0K mXyG9Zo99q0k1gI80Bgw/Ab6lgza57NZKGzSw2Q0Dk6JP4JHEz7TeivZRVzFvsHK0iwb HjJC1Qbxd1CTfwWA8TELVSxcFPiSAS9uxZSbdNDzspMAGYBIW98yRYzWpmIe6lUyr3uv +v2A== 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=xhjB6OpE2jsvt0Qsr3VT+X0Amcl8TSJfdeWJ9T/KVuI=; b=iQPQsl3/aXitBudOV8uHCD0GUdsaY2M8KL2O43Js7nLIc5yZSDJuwfzRLARnO/cqIy aCHVWUM4Lcgz+oKVtxzglxCD0B7mDWQUZSLPa1P1zrrydYtUZ58ZdZd4KrAsgp3wFiHA GLGQg7NsL4stjtRnWH8lradtP66jt8xEL2x8uPeIrMhlu9HoOrAucMxQP+WvNUuSzzBW y9EeNbGwkZKzKPchAKIvhz52O305f52FWSmNgof5sKN5/67RdMF+RCD9ItaIcF+oBfcF aNFyr3qamcUTM5CMjbllE44n7EckXA2n8j5yw2ImkXWX7mYj3oQZVQRoBW3cjwOoWdsY OX0A== X-Gm-Message-State: ANhLgQ2Pw7I6gJ9RksvpCMOiYGBKub+uSk68QuzvgGCOwlpBb677zT3S YJIC4tyUJ6aR4pdVZtr4GfPxcJIN X-Google-Smtp-Source: ADFU+vv+6jdIyGOCTQ9w6h+gm1Y/MjfXpraPQwLVw1KnKW6xYea137Jy5cjhHE4QLTnHuKfv3mYl1Q== X-Received: by 2002:a63:161e:: with SMTP id w30mr15456465pgl.110.1584838568549; Sat, 21 Mar 2020 17:56:08 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.56.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:06 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v2 4/8] t5003: skip conversion test if unzip -a is unavailable Date: Sun, 22 Mar 2020 07:55:15 +0700 Message-Id: <4f0ac0867c4b50edcee4255237f8a122155fd9d2.1584838148.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Alpine Linux's default unzip(1) doesn't support `-a`. Skip those tests on that platform. Signed-off-by: Đoàn Trần Công Danh --- t/t5003-archive-zip.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index df1374a312..3b76d2eb65 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -11,6 +11,10 @@ test_lazy_prereq UNZIP_SYMLINKS ' test -h symlink ' +test_lazy_prereq UNZIP_CONVERT ' + "$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip +' + check_zip() { zipfile=$1.zip listfile=$1.lst @@ -35,33 +39,33 @@ check_zip() { extracted=${dir_with_prefix}a original=a - test_expect_success UNZIP " extract ZIP archive with EOL conversion" ' + test_expect_success UNZIP_CONVERT " extract ZIP archive with EOL conversion" ' (mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile) ' - test_expect_success UNZIP " validate that text files are converted" " + test_expect_success UNZIP_CONVERT " validate that text files are converted" " test_cmp_bin $extracted/text.cr $extracted/text.crlf && test_cmp_bin $extracted/text.cr $extracted/text.lf " - test_expect_success UNZIP " validate that binary files are unchanged" " + test_expect_success UNZIP_CONVERT " validate that binary files are unchanged" " test_cmp_bin $original/binary.cr $extracted/binary.cr && test_cmp_bin $original/binary.crlf $extracted/binary.crlf && test_cmp_bin $original/binary.lf $extracted/binary.lf " - test_expect_success UNZIP " validate that diff files are converted" " + test_expect_success UNZIP_CONVERT " validate that diff files are converted" " test_cmp_bin $extracted/diff.cr $extracted/diff.crlf && test_cmp_bin $extracted/diff.cr $extracted/diff.lf " - test_expect_success UNZIP " validate that -diff files are unchanged" " + test_expect_success UNZIP_CONVERT " validate that -diff files are unchanged" " test_cmp_bin $original/nodiff.cr $extracted/nodiff.cr && test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf && test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf " - test_expect_success UNZIP " validate that custom diff is unchanged " " + test_expect_success UNZIP_CONVERT " validate that custom diff is unchanged " " test_cmp_bin $original/custom.cr $extracted/custom.cr && test_cmp_bin $original/custom.crlf $extracted/custom.crlf && test_cmp_bin $original/custom.lf $extracted/custom.lf From patchwork Sun Mar 22 00:55:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11451481 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B5821668 for ; Sun, 22 Mar 2020 00:56:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD8B220757 for ; Sun, 22 Mar 2020 00:56:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gl9ASiqq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728282AbgCVA4R (ORCPT ); Sat, 21 Mar 2020 20:56:17 -0400 Received: from mail-pj1-f68.google.com ([209.85.216.68]:33316 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728274AbgCVA4O (ORCPT ); Sat, 21 Mar 2020 20:56:14 -0400 Received: by mail-pj1-f68.google.com with SMTP id dw20so4608313pjb.0 for ; Sat, 21 Mar 2020 17:56:12 -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=xD4IRpQsYEKlskeJAyETTTopx15+pbpH5BEzlyPlcTM=; b=gl9ASiqqcjY5/YBaZGqHiTQ26i9io/N4PCnMsOJm4OcwFfyWDaIKSnCOVVZbPKPVnr sxDd4+u+dB5VA9bmLDtfDekFqEcqnKNPSr532q80kxHy9KeLWke1TuL5UIIJFZ4Pd2BH 3Scwvjp68B0wdYvsAIiN7ItDYcanBFqZ5XUUo7Yo57WszJych6ODoCKlhNsoDIPQLPX1 HDX55HmLLOr4nJWMisIhsFUXqR84Dcd7R4uWs7muk7TAgYYZFkaX+12hRm2hMoE64HUp 1sguQBUA4/QO4N+d5DH4Aqb9f3IdnCFR70NsnlXqvGbCibDfvuohm6/nU75OjvnWQGyS j8Qw== 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=xD4IRpQsYEKlskeJAyETTTopx15+pbpH5BEzlyPlcTM=; b=kiOdz3YujNY7iS6xgErc8MKzIiyEBusTYiGa7r7QGN6Hv0nG1xXeeUaDfHBRPV3TYo yXi3NK/imk72qusHCICqynCrwSJuUu7nmIJpzoZbw13W6h/L3fZgtG5HnTwHQ3b/3tKX /Z8q1Xba5tSfZYGxGp/RiRBzAiAd1o2I/PZfoCq5T+UftLXzmvDLqdVVkHx1yDd3kkm0 UNDYV0BAdRXl9LB4biT27NLKcPE7V4a5ffLtwDUciKO47qqBD7hM2f37msn6jeONJU9s NjMNp2t5kHf1q2VD647P/X2N7uXFrObK8QvrXA6EUUD6oCnHnN2cR1B1GFI7yc5uydr5 SAaw== X-Gm-Message-State: ANhLgQ0Z9G9JPKA04Ula7ymI8ozDC10sO9AEO2UkKavf17fX7m4IkaZZ nWVlrSEGwK5aRUspRc0vsvdi0ntP X-Google-Smtp-Source: ADFU+vtG/Nm3t0nziURxpo63iXe26EVHK0aGus4PRW3ijglIKUWeCXGiP/cZuWRfamJfeC5NP+zZUg== X-Received: by 2002:a17:90a:272d:: with SMTP id o42mr15196582pje.194.1584838571696; Sat, 21 Mar 2020 17:56:11 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.56.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:11 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v2 5/8] t5616: use rev-parse instead to get HEAD's object_id Date: Sun, 22 Mar 2020 07:55:17 +0700 Message-Id: X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Only HEAD's object_id is necessary, rev-list is an overkill. Despite POSIX requires grep(1) treat single pattern with as multiple patterns. busybox's grep(1) (as of v1.31.1) haven't implemented it yet. Use rev-parse to simplify the test and avoid busybox unimplemented features. Signed-off-by: Đoàn Trần Công Danh --- t/t5616-partial-clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index 77bb91e976..09e640cae4 100755 --- a/t/t5616-partial-clone.sh +++ b/t/t5616-partial-clone.sh @@ -49,7 +49,7 @@ test_expect_success 'do partial clone 1' ' test_expect_success 'verify that .promisor file contains refs fetched' ' ls pc1/.git/objects/pack/pack-*.promisor >promisorlist && test_line_count = 1 promisorlist && - git -C srv.bare rev-list HEAD >headhash && + git -C srv.bare rev-parse --verify HEAD >headhash && grep "$(cat headhash) HEAD" $(cat promisorlist) && grep "$(cat headhash) refs/heads/master" $(cat promisorlist) ' From patchwork Sun Mar 22 00:55:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11451487 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 190B61668 for ; Sun, 22 Mar 2020 00:56:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB6FE20767 for ; Sun, 22 Mar 2020 00:56:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i9nt6RG7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728294AbgCVA4T (ORCPT ); Sat, 21 Mar 2020 20:56:19 -0400 Received: from mail-pj1-f67.google.com ([209.85.216.67]:51000 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728176AbgCVA4T (ORCPT ); Sat, 21 Mar 2020 20:56:19 -0400 Received: by mail-pj1-f67.google.com with SMTP id v13so4317747pjb.0 for ; Sat, 21 Mar 2020 17:56:17 -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=IB755LcfuSoIWiwR1OhUu7cTx+eFXhivtO80o0JADj0=; b=i9nt6RG7ZutfDAbgR6SklMEKDSrBAzB5ipju6p/iO3KAHaSPlG6xDsA7vWYQSx617m Mug0wGbehTD1pudSL/jAB+heeZPYUyqdj1u9SQsnQ3gpjjR/hn2wMpV0YaQR727zV2QF X29IgvPRSBkiNQWpVhWu0kTh4Z1FYdT7qxAfQjpxV/pwmDL9PF3Aka3vs7ICc3NaI0G/ uhqZsBrOeUWrSL0ik5GUBeau28jEIimR6xZA05AU6rD7uR5RZQ6iES+hvf5bvTktqtV/ ly9dijYNT6GaxISj10DoLkr3ufXsOlDn/wKCabb+XIg/53/lVHT10FzqBvSHyVgockPQ f6QQ== 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=IB755LcfuSoIWiwR1OhUu7cTx+eFXhivtO80o0JADj0=; b=KBIanaYnU7k0p3lH9huKlxld2pmwJNNLL9wvU2ZUc2oKwcu/sOGKApFZjAjLFmkYiQ ywX8madS9jN176SnwOaE44tRL+FXPw67Q1fucE93h0mVZiDdSvYys91A+vCeVG5NLhH4 ymfDwWk4erjGU3oI7ymoGTg4xTqUlhdaNi2koWUmNhGLekCQiNXgxXse2V9AaGFbUXRP kvWEcX+mVjI6JVNz4+JKOpodEAtq2vSM+lIOVcgOlLMj0KEv7XrKHsoaWyXus2Ow+Zy+ xmerpXnLnpVNaR19wFRAPnvVJ+f+ZpDK4QOZwWvOTjKpvfw5kl47+twcx9rkH436uYtR uXRA== X-Gm-Message-State: ANhLgQ19bt5LWAUN9WZ4uQA0t3eRiAMpNEG3QTmVRzsvFSaCzk/z4HHm v/+CbCD/T/xsY+n1sX9toBwaPRDo X-Google-Smtp-Source: ADFU+vu+CYCUU2iXFr1ZPS6FPJrzdS3tIkyMmUIZI/e4X7kDEPToZ5sQzW+OB1ITWjh1xHvAVsRM2Q== X-Received: by 2002:a17:90a:25c8:: with SMTP id k66mr17504307pje.90.1584838576334; Sat, 21 Mar 2020 17:56:16 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.56.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:15 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v2 6/8] t7063: drop non-POSIX argument "-ls" from find(1) Date: Sun, 22 Mar 2020 07:55:20 +0700 Message-Id: <59e3f73784b2a3bd9ccec87412e6178411c3708e.1584838148.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since commit 6b7728db81, (t7063: work around FreeBSD's lazy mtime update feature, 2016-08-03), we started to use ls as a trick to update directory's mtime. However, `-ls` flag isn't required by POSIX's find(1), and busybox(1) doesn't implement it. From the original conversation, it seems like find(1) with "-type d" could trigger enough "lstat(2)" to ask FreeBSD update mtime. Use only filter "-type d" for now. Signed-off-by: Đoàn Trần Công Danh --- t/t7063-status-untracked-cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 190ae149cf..6791c6b95a 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -18,7 +18,7 @@ GIT_FORCE_UNTRACKED_CACHE=true export GIT_FORCE_UNTRACKED_CACHE sync_mtime () { - find . -type d -ls >/dev/null + find . -type d >/dev/null } avoid_racy() { From patchwork Sun Mar 22 00:55:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11451489 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27C301668 for ; Sun, 22 Mar 2020 00:56:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0541420757 for ; Sun, 22 Mar 2020 00:56:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EB300qT4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728300AbgCVA4U (ORCPT ); Sat, 21 Mar 2020 20:56:20 -0400 Received: from mail-pj1-f66.google.com ([209.85.216.66]:55420 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728288AbgCVA4T (ORCPT ); Sat, 21 Mar 2020 20:56:19 -0400 Received: by mail-pj1-f66.google.com with SMTP id mj6so4306072pjb.5 for ; Sat, 21 Mar 2020 17:56:18 -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=Puwg0Ffwrrpv5BPlU/cmylL09IypWqP0r6DXOCzzGvo=; b=EB300qT4p4H1vsTw8pL4BOPy/RSeg47YAfMp/VtY3YWeZngYsgCO2f8guxXwn+yvsy wfWKeVgBOJD0rRwQntdOUwqfan+00g92yGEr+9//CAaXz+9XRXUxmayqmuH3hFD4Gk8b bO9VWzhPyMbiYkPQTMzjkJbz5mnGK7ECLg/Wm1ZDjs7X4zyKtBvtzm5BpxPBdM/7GSaH r+EYShOjz7rUjzFVF+YF38qU5Lp+71a0DdDCiGbfsvR9FIlpbqWClkTSBUNvQzgOZwWa UlIjpw2mFk5jtcrEIW1mGu4//DfKGvVz5R8U/dFU8wLTe2DOUwApNjoleMKrxRhYqDL9 ImKA== 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=Puwg0Ffwrrpv5BPlU/cmylL09IypWqP0r6DXOCzzGvo=; b=hN1SfGvT2FgH9Gxqb6HJRUZDE7qT5Wy2+tqrBTbYBWeJL2IGoJ0856Ir1j6slFKlBU I3wcNVckf9oV2A3QGOH2fRH/khzbmSKVfv4JGnx59VbamRWDhAzcKiUvos7s9hyubVhH HrXLHsRwe6BNGMz5yJLrw32+xgZgZqocsHbIXa7yfbE6HHa+y0dR1cXC62RszhjkHNzA 0gLSOu57zItm1/0oGojDaOQMZ4hHHooOdDbCYESmQJw9dK9X1w0rSSkxz/OdvAzEJ/Rs 4sjsLW+Qbrm8cCGvg5xns9DXDWL/6icemUSwgFmL5o53EXpubafD9zCSi/0FTVhsUHye 1wyg== X-Gm-Message-State: ANhLgQ3vkr2zSvAEDbBO++l7YZib6Kms8lIo7rX7qGNQIkgTmOGm1pFg Ip0LfYgHuHpDyo+8NwHIVq7iElFq X-Google-Smtp-Source: ADFU+vuCrbR43n/LP+2KCiHAiBkvyRFSzSoA4VzWdcVl4Avfr1PVYxcESTOvMF96x5J5khpgQ+QDHQ== X-Received: by 2002:a17:90a:757:: with SMTP id s23mr17356454pje.166.1584838577998; Sat, 21 Mar 2020 17:56:17 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.56.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:17 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v2 7/8] t4124: fix test for non-compliant diff(1) Date: Sun, 22 Mar 2020 07:55:21 +0700 Message-Id: <10f39c3d30d13e9141f081f985a0620954cc7493.1584838148.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org POSIX's diff(1) requires output in normal diff format. However, busybox's diff's output is written in unified format. POSIX requires no option for normal-diff format. A hint in test-lib-functions::test_cmp said `diff -u` isn't available everywhere. Workaround this problem by assuming `diff(1)` output is unified if we couldn't make anything from normal-diff format. Signed-off-by: Đoàn Trần Công Danh --- t/t4124-apply-ws-rule.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index 971a5a7512..075b1912be 100755 --- a/t/t4124-apply-ws-rule.sh +++ b/t/t4124-apply-ws-rule.sh @@ -52,6 +52,12 @@ test_fix () { # find touched lines $DIFF file target | sed -n -e "s/^> //p" >fixed + # busybox's diff(1) output unified format + if ! test -s fixed; then + $DIFF file target | + grep -v '^+++ target' | + sed -e "/^+/s/+//" >fixed + fi # the changed lines are all expected to change fixed_cnt=$(wc -l X-Patchwork-Id: 11451491 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AFB4E159A for ; Sun, 22 Mar 2020 00:56:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 902A120757 for ; Sun, 22 Mar 2020 00:56:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gGZAKOEO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728307AbgCVA4W (ORCPT ); Sat, 21 Mar 2020 20:56:22 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40901 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728301AbgCVA4U (ORCPT ); Sat, 21 Mar 2020 20:56:20 -0400 Received: by mail-pg1-f195.google.com with SMTP id t24so5171269pgj.7 for ; Sat, 21 Mar 2020 17:56:20 -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=CZcBGgwUU7ZEl+yafXL19Ukf2zYYiTHwCg8RNZ4Hvbw=; b=gGZAKOEOCtPcc109EwLWDal0FRvIg6yWexZ048MwkDnSl3AHUY5pSn9Y0Wk5w0BC5c tIzEO2Ew+tBnQPB5tuUBjDShaUzPEMSmz5HR9axAdL2GAAbRm3pr3TNmDIpP8bxTnA6e Gto0xmdl9XKTLGPEZ3AvYRsS0YYE+XoPbKriAow6cuiaPiisBa0U3cZVOExxaTC3QXjY Mtt1aufPnfw2C09ZnpA6A3mI+AOJ63vMHmnj046TsyVw5/G5BDo/4GLA+MPdf4lZbz+k BA0BKvB/vAQeQHPOIzCBmu6MhNiNMa+tP9R3RAnCNT4cKqgiwRa2y9pkjDn8n5Y4cE0B PqFg== 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=CZcBGgwUU7ZEl+yafXL19Ukf2zYYiTHwCg8RNZ4Hvbw=; b=Ze/PCQLfyTHuJMLSoyNZVWRIslZ2w+mpaG1PCvpypuZv+0C53JiyXiz6SXA1nqWtX1 Zqw50oR6u2gOl1Vcv4NQThsLrXygmFbKJpQVgxF+TdQXVd0nmFHNmPYqHeieVKM5P6RY 6Zm+B7yx32njK5HlNiDLRLZkROSffrCqf0eUO5i5YO2jZlZ6K+khjGBOiva85dpqs5ZN gXkbCa0L3EZzUto0aBFjO7uzFmxqrgVkNqaZLPp+Fu6BjscH0iQPkyCO61EWqNBKUtrl bcd2TZsuyj7isS6BCM6XjGNzOp8Jkt2jsnxhvxa4QTMe+Yij4QcuKFaxKgIvbtHeZL0U /RbQ== X-Gm-Message-State: ANhLgQ3UZwkya0fcJS15/0vsmzAHtFYH/5TXSIj+2lx1poHd+ALhG9Rr SWopn1qD35bv69eb2LnVD9NRCHy2 X-Google-Smtp-Source: ADFU+vtWezT+DmZZD5zU1Z+KmVufLTZAq+hLkpWGUeCoE8Vda9jBdDMLdHa71tbRol5dVjBf+heNcw== X-Received: by 2002:a63:ad46:: with SMTP id y6mr15501294pgo.11.1584838579718; Sat, 21 Mar 2020 17:56:19 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:576b:56ff:d97c:a505:3e0c]) by smtp.gmail.com with ESMTPSA id r7sm9235641pfg.38.2020.03.21.17.56.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 17:56:19 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Jeff King Subject: [PATCH v2 8/8] t5703: feed raw data into test-tool unpack-sideband Date: Sun, 22 Mar 2020 07:55:22 +0700 Message-Id: X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org busybox's sed isn't binary clean. Thus, triggers false-negative on this test. We could replace sed with perl on this usecase. But, we could slightly modify the helper to discard unwanted data in the beginning. Fix the false negative by updating this helper. Helped-by: Jeff King Signed-off-by: Đoàn Trần Công Danh --- t/helper/test-pkt-line.c | 2 +- t/t5703-upload-pack-ref-in-want.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c index 282d536384..12ca698e17 100644 --- a/t/helper/test-pkt-line.c +++ b/t/helper/test-pkt-line.c @@ -67,7 +67,7 @@ static void unpack_sideband(void) case PACKET_READ_NORMAL: band = reader.line[0] & 0xff; if (band < 1 || band > 2) - die("unexpected side band %d", band); + continue; /* skip non-sideband packets */ fd = band; write_or_die(fd, reader.line + 1, reader.pktlen - 1); diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index 7fba3063bf..a34460f7d8 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -13,10 +13,7 @@ get_actual_refs () { } get_actual_commits () { - sed -n -e '/packfile/,/0000/{ - /packfile/d - p - }' o.pack && + test-tool pkt-line unpack-sideband o.pack && git index-pack o.pack && git verify-pack -v o.idx >objs && grep commit objs | cut -d" " -f1 | sort >actual_commits