From patchwork Wed May 20 03:44:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 11559225 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 80714913 for ; Wed, 20 May 2020 03:45:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 697CF20829 for ; Wed, 20 May 2020 03:45:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eLbYsYb/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728568AbgETDpG (ORCPT ); Tue, 19 May 2020 23:45:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728129AbgETDpF (ORCPT ); Tue, 19 May 2020 23:45:05 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72676C061A0E for ; Tue, 19 May 2020 20:45:05 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id s69so620742pjb.4 for ; Tue, 19 May 2020 20:45:05 -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=04/JYjKUKXaLwff96hkthUki9u9In6mW0M1dwuflJwk=; b=eLbYsYb/3SDeL7g8pmJ11YO41DFEN8DrRaaoO29ksJnRU6z/RfgZFV/x4KdQxMAkpH 0gN9bJd5jw8ix4Zy8XDFFt0ODOLt0p2anJXFOsGis0d2JvwNXnWm5iAOssUA4FW0HFCc vJvo9g/5uBtJfpSvLkYAXkKo9C4ebeAcXjVercBTM4Y7PMmRTiA6jULiQyE2Mdzt0s2W B+viiyghKZhHSFHEMHqX9kHpiCK8cVrUNvQYd1AHsdToIWNzpzZ8BoLefiP5uisHSqIq unyUSBgrfmO1jYeC/EpFVCHuPj6Yg53DsqVkB4oGySnk27iIp6coTbahJzhVeezrKI+P Fswg== 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=04/JYjKUKXaLwff96hkthUki9u9In6mW0M1dwuflJwk=; b=DS5TeYGxG94aVgQ9IPVD1I/NjYdoIa1IE9E44hdMusPpfZncncYe0DRmkUnvuRmanR hOmKL8sao8czzbyCFJfJhqCRm9mDMEd0s+cOJvr0JPO2RM1SZ4wIQogICjwpWn/TTBx6 6JoCSOtOfOR+zcob4nC/dfAnjLZXTVw7HXZqfhp4uGR3NID3d7gLDAigNlv8OxwCgwi4 jwgkX9h8SBqMwPJBdq3Z3H9fW7zr51c8ipJXicI6QksMSicu3ZXp38T9A+uOmtMQL0ZY wdsH1R7vgH+xottJnt0yAeHfJrQWiiIyhor2uK4M2nOi9rjMXHzcpX5BkMCseOUPDELx r8bA== X-Gm-Message-State: AOAM530juX+zr12kNBjLZX6huVF8gT35TF6nPq/Xh522xUrNtRE49ha9 nMMp1i81L7gJqW73qAZE0TdvUl/I X-Google-Smtp-Source: ABdhPJwkbIZFUG4QZ5f+XAhMzqlQ80/tQqTBgZmrIgns6eCWj8NtfqJKybFznQWxCXM+iFUX1CNfKA== X-Received: by 2002:a17:90a:3201:: with SMTP id k1mr2882404pjb.202.1589946304719; Tue, 19 May 2020 20:45:04 -0700 (PDT) Received: from localhost.localdomain (c-67-188-192-166.hsd1.ca.comcast.net. [67.188.192.166]) by smtp.gmail.com with ESMTPSA id h4sm762820pfo.3.2020.05.19.20.45.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2020 20:45:04 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: liu.denton@gmail.com, chwarr@microsoft.com, garima.singh@microsoft.com, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH 1/3] t4216: avoid unnecessary subshell in test_bloom_filters_not_used Date: Tue, 19 May 2020 20:44:42 -0700 Message-Id: <20200520034444.47932-2-carenas@gmail.com> X-Mailer: git-send-email 2.27.0.rc0.187.gede8c892b8 In-Reply-To: <20200520034444.47932-1-carenas@gmail.com> References: <20200520034444.47932-1-carenas@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Seems to trigger a bug in at least OpenBSD's 6.7 sh where it is interpreted as a history lookup and therefore fails 125-126, 128, 130. Remove the subshell and get a space between ! and grep, so tests pass successfully. Signed-off-by: Carlo Marcelo Arenas Belón --- t/t4216-log-bloom.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh index 21b68dd6c8..c855bcd3e7 100755 --- a/t/t4216-log-bloom.sh +++ b/t/t4216-log-bloom.sh @@ -70,7 +70,7 @@ test_bloom_filters_used () { test_bloom_filters_not_used () { log_args=$1 setup "$log_args" && - !(grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf") && + ! grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf" && test_cmp log_wo_bloom log_w_bloom } From patchwork Wed May 20 03:44:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 11559227 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 18623913 for ; Wed, 20 May 2020 03:45:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 01A6920829 for ; Wed, 20 May 2020 03:45:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MoZG6MQZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728601AbgETDpJ (ORCPT ); Tue, 19 May 2020 23:45:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728129AbgETDpI (ORCPT ); Tue, 19 May 2020 23:45:08 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7784BC061A0E for ; Tue, 19 May 2020 20:45:07 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id nu7so629974pjb.0 for ; Tue, 19 May 2020 20:45:07 -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=stCIMIQtDEbS0qJRJ8o9zPYiCRHfGRlEK97As9KUZnw=; b=MoZG6MQZw/q0/Wij20PUSUhYBbMg7PVK8iu2VOSpwgjqf6RAwR73SCJQZX0ioN1Vm1 pyzARl69AqMS2vOU0Id5sBPqwCwfhMTBSCNHFEpTEnn7GlfyWmUhEyvXo/Fy5ODo+5pK Er3YA/VBIQMc5f59cPDmi4J9eUEJ1U/uz14ZnVIljnIh3vAQrkpoj+dwqD0i0Hb8lGPu u//jti2M4xE9TkiKswEOB2BFoUNDJJa1+gYSFRHlnrkkBKlJOi1sgeiKlU1+owT8nU0O KoaRyg6Ml0rRvDwbDO0A+MNIxXiJFYWliHqoHmDVippVG2ExS6l6TaHHBYQjVkHLPVQF /xOg== 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=stCIMIQtDEbS0qJRJ8o9zPYiCRHfGRlEK97As9KUZnw=; b=lLOGv4M7Mrt+81PxlfB40cOzUPc6K7/WBJFXAcTzUWhQoXPvofcmbPzhI/eNiOO7fn 82SHUIQ928nMxDUu9Y6whPm2vV0xlq8gR33KN+OHY9+vBPMth4KfHQiI8sLQJalu3K3p dZ/G7W9Jo+H3rCvajYi4mh/eLKJhahyE6TAszLR2kvkOUa/rJDLPVLVt2n7knv3pgJ2O NcP4p1yNN9SJXplE9y6sXoPMQ2psFEYEgGZ7ZtRF4ol3LnR9ISlYPKUuPUeeRMxWdLYs ZzAVJ1KoR5UFYEVkZFIu1e3A0Cxlr2pnXM+fFdraazC31ublbtwH5oZIx1plHqQ60Psi sE4w== X-Gm-Message-State: AOAM5315Rn0bZ5W7z+MRa7mQT22tzPd/JIp01jTPpeIVU0y12X8pLn/l 4DB+Qe09ve59fPNR9Kva6e7M0Bkg X-Google-Smtp-Source: ABdhPJy6eLGC8ScHJA8BnwYrkHn7APsHaXVBveA4qHRmCoE7xtNhhw7WIyqVjPGkojFaj9373dfouQ== X-Received: by 2002:a17:90b:897:: with SMTP id bj23mr3020165pjb.82.1589946306690; Tue, 19 May 2020 20:45:06 -0700 (PDT) Received: from localhost.localdomain (c-67-188-192-166.hsd1.ca.comcast.net. [67.188.192.166]) by smtp.gmail.com with ESMTPSA id h4sm762820pfo.3.2020.05.19.20.45.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2020 20:45:06 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: liu.denton@gmail.com, chwarr@microsoft.com, garima.singh@microsoft.com, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH 2/3] bisect: remove CR characters from revision in replay Date: Tue, 19 May 2020 20:44:43 -0700 Message-Id: <20200520034444.47932-3-carenas@gmail.com> X-Mailer: git-send-email 2.27.0.rc0.187.gede8c892b8 In-Reply-To: <20200520034444.47932-1-carenas@gmail.com> References: <20200520034444.47932-1-carenas@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 6c722cbe5a (bisect: allow CRLF line endings in "git bisect replay" input, 2020-05-07) includes CR as a field separator, but doesn't account for it being included in the last field, breaking when running at least under OpenBSD 6.7's sh. Read the revision into a raw variable and strip it of any possible embeded CR characters, before use. Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Carlo Marcelo Arenas Belón --- git-bisect.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index 71b367a944..8cd6095a71 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -210,14 +210,15 @@ bisect_replay () { test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")" git bisect--helper --bisect-reset || exit oIFS="$IFS" IFS="$IFS$(printf '\015')" - while read git bisect command rev + while read git bisect command rawrev do test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue if test "$git" = "git-bisect" then - rev="$command" + rawrev="$command" command="$bisect" fi + rev=$(echo $rawrev | tr -d '\015') get_terms git bisect--helper --check-and-set-terms "$command" "$TERM_GOOD" "$TERM_BAD" || exit get_terms From patchwork Wed May 20 03:44:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 11559229 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 48702138A for ; Wed, 20 May 2020 03:45:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3131220829 for ; Wed, 20 May 2020 03:45:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RkQlVHA2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728615AbgETDpJ (ORCPT ); Tue, 19 May 2020 23:45:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728129AbgETDpJ (ORCPT ); Tue, 19 May 2020 23:45:09 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31B37C061A0E for ; Tue, 19 May 2020 20:45:09 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id q24so640956pjd.1 for ; Tue, 19 May 2020 20:45: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=xMdLUne3XHENiU2rfcTZT69FVPManFDatvC6OhSlFEE=; b=RkQlVHA26kG9dPZMMe/tDrg8fFy15okTmQIkyH0FpBUgI2voED0WhphFXUDvHwV/QQ BDJZwm+g/8rEscxtwloOWQkRqIAW8xaSTGTweqwiE2//89HmfZIGLw6Cy18eg5r877Dt chnu8BrnomgLPUMoE3HaHJ2oau6TDztvfwTxq6JHpQooOV6Ei5bMfMlU9z9der8cnuky 3d4mDiXMQr6po2DOEK5Nsr5ZfTuBxV9FNF2uJ3OUl7zyH3ZqXkBASSugs92MXlRO3B0B NGtpN7Uu906MY4EGfLJ022bShYw6NFwgzpMuVuBMIL57drrVuYt2uH41ZV293YIOqBfu VcgA== 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=xMdLUne3XHENiU2rfcTZT69FVPManFDatvC6OhSlFEE=; b=IzgiZXQHWYdljo0X4Co2jJGekVotp43j807O+TLji756Afx3Xf7WKon1VQHtWrB4f8 tx4/s8mZTA1TQ1NkJvf/OTnwzivsw/WffgWdpd2Go5gerMnxBZjrrcDxFoPm6kGcqtMC fJ2mzIsqnRK2+MI1wn60cUFeV0rmrtzQPGeTuuCD+Xjc0TKkWnklyTDn5DAjHCnafzL3 9/3P7H7rhXhw0ja//sFXuHY9Zaa8++dRaCJ8acEko8OqQY1d0ZgkDxKdwAg6ZK01txyR JgU31ktj5BUA9tHEGB9ZcV38spCszCwMXExipYjoX/WVVsxW/PmEtG98bDz2Rok2rfP4 4Dkw== X-Gm-Message-State: AOAM530u2GsyZ0XSuzD0X5284aYts4NANdInxooXNmkoVcNLfPJEw9cW 7GFcjjGAafpe97icDcx7bSPIgII2 X-Google-Smtp-Source: ABdhPJyEjOdMrbiAnRmLOlz3Yz4mnO9kZ10GV52lhn0q0Xv71/PQ7DLNR6LhU94zDB/HEvIw99DGZg== X-Received: by 2002:a17:902:ab8b:: with SMTP id f11mr2713351plr.145.1589946308409; Tue, 19 May 2020 20:45:08 -0700 (PDT) Received: from localhost.localdomain (c-67-188-192-166.hsd1.ca.comcast.net. [67.188.192.166]) by smtp.gmail.com with ESMTPSA id h4sm762820pfo.3.2020.05.19.20.45.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2020 20:45:08 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: liu.denton@gmail.com, chwarr@microsoft.com, garima.singh@microsoft.com, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH 3/3] t5520: avoid alternation in grep's BRE (not POSIX) Date: Tue, 19 May 2020 20:44:44 -0700 Message-Id: <20200520034444.47932-4-carenas@gmail.com> X-Mailer: git-send-email 2.27.0.rc0.187.gede8c892b8 In-Reply-To: <20200520034444.47932-1-carenas@gmail.com> References: <20200520034444.47932-1-carenas@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Instead of using a BRE, that broke tests 30-32, 37-39, 42 at least with OpenBSD 6.7; use a simpler ERE. Fixes: d9f15d37f1 (pull: pass --autostash to merge, 2020-04-07) Signed-off-by: Carlo Marcelo Arenas Belón --- t/t5520-pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 37535d63a9..9fae07cdfa 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -28,7 +28,7 @@ test_pull_autostash_fail () { echo dirty >new_file && git add new_file && test_must_fail git pull "$@" . copy 2>err && - test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err + test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err } test_expect_success setup '