From patchwork Mon Oct 7 10:22:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 13824417 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3801158A36 for ; Mon, 7 Oct 2024 10:22:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728296537; cv=none; b=u9EtJ5QN2/xSlksw+jMk/O7fwynK6cR5yOAKILFICzyFszJDMgvJZIf3OgE2Gog+UDlRevPrILV5ca3DzrjX9G2MbLAtSCe6SYCHs1so9KFFNTCvI1mCzcLkxVul+yVxiqo9SVnpKRqmZPxd1vHuKhQeSsHcnL3ycVMHUJKtMvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728296537; c=relaxed/simple; bh=8X7AYbIkdi6HWMJsOn8WL8bQ8PJ1PdePDY/MmQ8HcQA=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=dBzTspiqhnUal9hqTxLc2y3QCelXh7w4/jH96ce22mh2wrwjiRTXY9Hi9ez/3L8S/ZabfdcBHiW3FDwhi7DtEyA9Rpla0JE41jdJljeA315yuOVS0tad3U3tF7RilK9IQMeSDoxjC2HY5tTW71e88K9WmXcRfyV3NAlzP5gPDT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Pj5x6Dm4; arc=none smtp.client-ip=209.85.208.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Pj5x6Dm4" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5c718bb04a3so5982027a12.3 for ; Mon, 07 Oct 2024 03:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728296534; x=1728901334; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eDnWYjNHpEFCxbMSFSMnpDZIaC6pxr1AJpOo0w99cRM=; b=Pj5x6Dm4RhxQjj5WHLnOHWTtwHfw1RgNknszq1szWwI2jBO/TCv74f0nrM5YwUktQ8 3tUYguCi8VTmifsYn/u48LC3KW2CS0bbFkxxaytdStpCiK4b7ZpON374TgNytm7bdzED bKkqnAFgl0zPdhrP+onUJG8yN4GusqMJ6OZU0tu2afK0mkcPwgjohWzcfcNR2nqtXYSU p5TPCDhJUW5nkF6ZLELNiyCHyOCTOQYTjQ3DLT9f2EwNRpHBo72iwxVrwKbX/Bu0wYqx kC7/GfH0TtOpkygRuQzXDwb8DRuzS8y7vgomQ7EDmzH39R/KWSZXTQDxcNM22LxWOAVf ah/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728296534; x=1728901334; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eDnWYjNHpEFCxbMSFSMnpDZIaC6pxr1AJpOo0w99cRM=; b=p7Bu1/o8JqTSpgoaMAkrK5wq8ZDYN4uMf0+JII885Za3FOSQ7mvQD1FQSFhUVh64Ks Q0JDyZYl4ZQdXQQTDyIjAwQX58g6D9J0WaiOYaHtLlJ9DvvuHkwoRngeP7IlMBZJLIho 0ChRssKQeWVI6slBG64m0tiFBLiqAAkrKKsOCdoOc5qny7e96mqJsFDBJrBeUe94lr7g 8wB9kD36GWCEJOgjqpi1B7ICpZMMKKZGVxC7DFJXKU87b3UdV6u3EWDutiaYxsQWJtSk Z2wS25U6nch5dSWkSa+DeW70rXSJ2PzQnmYo/wbXYcGw+BxKqVNFQrmUq2DFO9sqFhDo nXOw== X-Gm-Message-State: AOJu0YxeV5K6tw03irtqAzNm/iaZGiga7GhdzR21JtmsRgRD8CB4v2oP eEgKY24FqdZzvs+GQ+51kd/fbpt6SYLTurckHGnMmPgvGMo/ePNHlWra3g== X-Google-Smtp-Source: AGHT+IH/CAFxgTPZE+7yKuEb+vRqpUo1K6ibcnsonrLrGymXIVh8FNjz4rc7UwGtiLLftGK1wNgf2w== X-Received: by 2002:a05:6402:50c8:b0:5c7:1ed7:8825 with SMTP id 4fb4d7f45d1cf-5c8d2e16682mr11001396a12.12.1728296533792; Mon, 07 Oct 2024 03:22:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c8e05ecafbsm3063681a12.70.2024.10.07.03.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 03:22:13 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 07 Oct 2024 10:22:10 +0000 Subject: [PATCH v4 1/2] t3404: avoid losing exit status with focus on `git show` and `git cat-file` Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Usman Akinyemi , Usman Akinyemi From: Usman Akinyemi From: Usman Akinyemi The exit code of the preceding command in a pipe is disregarded. So if that preceding command is a Git command that fails, the test would not fail. Instead, by saving the output of that Git command to a file, and removing the pipe, we make sure the test will fail if that Git command fails. This particular patch focuses on all `git show` and some instances of `git cat-file`. Signed-off-by: Usman Akinyemi --- t/t3404-rebase-interactive.sh | 71 +++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 23 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index f171af3061d..96a65783c47 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -319,7 +319,8 @@ test_expect_success 'retain authorship' ' GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && git tag twerp && git rebase -i --onto primary HEAD^ && - git show HEAD | grep "^Author: Twerp Snog" + git show HEAD >actual && + grep "^Author: Twerp Snog" actual ' test_expect_success 'retain authorship w/ conflicts' ' @@ -360,7 +361,8 @@ test_expect_success 'squash' ' ' test_expect_success 'retain authorship when squashing' ' - git show HEAD | grep "^Author: Twerp Snog" + git show HEAD >actual && + grep "^Author: Twerp Snog" actual ' test_expect_success '--continue tries to commit' ' @@ -374,7 +376,8 @@ test_expect_success '--continue tries to commit' ' FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue ) && test_cmp_rev HEAD^ new-branch1 && - git show HEAD | grep chouette + git show HEAD >actual && + grep chouette actual ' test_expect_success 'verbose flag is heeded, even after --continue' ' @@ -397,7 +400,9 @@ test_expect_success 'multi-squash only fires up editor once' ' git rebase -i $base ) && test $base = $(git rev-parse HEAD^) && - test 1 = $(git show | grep ONCE | wc -l) + git show >output && + count=$(grep ONCE output | wc -l) && + test 1 = $count ' test_expect_success 'multi-fixup does not fire up editor' ' @@ -410,7 +415,9 @@ test_expect_success 'multi-fixup does not fire up editor' ' git rebase -i $base ) && test $base = $(git rev-parse HEAD^) && - test 0 = $(git show | grep NEVER | wc -l) && + git show >output && + count=$(grep NEVER output | wc -l) && + test 0 = $count && git checkout @{-1} && git branch -D multi-fixup ' @@ -428,7 +435,9 @@ test_expect_success 'commit message used after conflict' ' git rebase --continue ) && test $base = $(git rev-parse HEAD^) && - test 1 = $(git show | grep ONCE | wc -l) && + git show >output && + count=$(grep ONCE output | wc -l) && + test 1 = $count && git checkout @{-1} && git branch -D conflict-fixup ' @@ -446,7 +455,9 @@ test_expect_success 'commit message retained after conflict' ' git rebase --continue ) && test $base = $(git rev-parse HEAD^) && - test 2 = $(git show | grep TWICE | wc -l) && + git show >output && + count=$(grep TWICE output | wc -l) && + test 2 = $count && git checkout @{-1} && git branch -D conflict-squash ' @@ -470,10 +481,10 @@ test_expect_success 'squash and fixup generate correct log messages' ' ) && git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup && test_cmp expect-squash-fixup actual-squash-fixup && - git cat-file commit HEAD@{2} | - grep "^# This is a combination of 3 commits\." && - git cat-file commit HEAD@{3} | - grep "^# This is a combination of 2 commits\." && + git cat-file commit HEAD@{2} >actual && + grep "^# This is a combination of 3 commits\." actual && + git cat-file commit HEAD@{3} >actual && + grep "^# This is a combination of 2 commits\." actual && git checkout @{-1} && git branch -D squash-fixup ' @@ -489,7 +500,9 @@ test_expect_success 'squash ignores comments' ' git rebase -i $base ) && test $base = $(git rev-parse HEAD^) && - test 1 = $(git show | grep ONCE | wc -l) && + git show >output && + count=$(grep ONCE output | wc -l) && + test 1 = $count && git checkout @{-1} && git branch -D skip-comments ' @@ -505,7 +518,9 @@ test_expect_success 'squash ignores blank lines' ' git rebase -i $base ) && test $base = $(git rev-parse HEAD^) && - test 1 = $(git show | grep ONCE | wc -l) && + git show >output && + count=$(grep ONCE output | wc -l) && + test 1 = $count && git checkout @{-1} && git branch -D skip-blank-lines ' @@ -572,7 +587,8 @@ test_expect_success '--continue tries to commit, even for "edit"' ' FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue ) && test edited = $(git show HEAD:file7) && - git show HEAD | grep chouette && + git show HEAD >actual && + grep chouette actual && test $parent = $(git rev-parse HEAD^) ' @@ -757,19 +773,23 @@ test_expect_success 'reword' ' set_fake_editor && FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \ git rebase -i A && - git show HEAD | grep "E changed" && + git show HEAD >actual && + grep "E changed" actual && test $(git rev-parse primary) != $(git rev-parse HEAD) && test_cmp_rev primary^ HEAD^ && FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \ git rebase -i A && - git show HEAD^ | grep "D changed" && + git show HEAD^ >actual && + grep "D changed" actual && FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \ git rebase -i A && - git show HEAD~3 | grep "B changed" && + git show HEAD~3 >actual && + grep "B changed" actual && FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \ git rebase -i A ) && - git show HEAD~2 | grep "C changed" + git show HEAD~2 >actual && + grep "C changed" actual ' test_expect_success 'no uncommitted changes when rewording and the todo list is reloaded' ' @@ -1003,8 +1023,10 @@ test_expect_success 'rebase -i --root retain root commit author and message' ' set_fake_editor && FAKE_LINES="2" git rebase -i --root ) && - git cat-file commit HEAD | grep -q "^author Twerp Snog" && - git cat-file commit HEAD | grep -q "^different author$" + git cat-file commit HEAD >output && + grep -q "^author Twerp Snog" output && + git cat-file commit HEAD >actual && + grep -q "^different author$" actual ' test_expect_success 'rebase -i --root temporary sentinel commit' ' @@ -1013,7 +1035,8 @@ test_expect_success 'rebase -i --root temporary sentinel commit' ' set_fake_editor && test_must_fail env FAKE_LINES="2" git rebase -i --root ) && - git cat-file commit HEAD | grep "^tree $EMPTY_TREE" && + git cat-file commit HEAD >actual && + grep "^tree $EMPTY_TREE" actual && git rebase --abort ' @@ -1036,7 +1059,8 @@ test_expect_success 'rebase -i --root reword original root commit' ' FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ git rebase -i --root ) && - git show HEAD^ | grep "A changed" && + git show HEAD^ >actual && + grep "A changed" actual && test -z "$(git show -s --format=%p HEAD^)" ' @@ -1048,7 +1072,8 @@ test_expect_success 'rebase -i --root reword new root commit' ' FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \ git rebase -i --root ) && - git show HEAD^ | grep "C changed" && + git show HEAD^ >actual && + grep "C changed" actual && test -z "$(git show -s --format=%p HEAD^)" ' From patchwork Mon Oct 7 10:22:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 13824418 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98B8E170A3E for ; Mon, 7 Oct 2024 10:22:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728296538; cv=none; b=JI4TNIXpgzkW1ypaXAbyVVSbXz4Cs/AmsWGoOjKSTk0YSHElWuU4Sqav0R88inWk8VOO2S2T7fFSCLJDiHSz3BvO4RM6CGAgws2eoxmT3Iv8qJLYewuCy/GE/i07+eNFzUenSJRO46+p/kuxzD4gVxJFQBq1ZmZL9sTsnPIvAhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728296538; c=relaxed/simple; bh=NnjdcCVLQmzJ0WNGMkp6eCSJRm+BsYlmP5u4ZetoDgE=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=htUyvgJTqHWKMFyCk4XQWLL0KGBV8G+Tswmu1vQcB8l+3ly5U+GRD6PQ2LSQNIcb9gLMUILxcwEe1CynzYarlAeXzQmU4ZOsnjOC6PxE4a6TGjhshVgZbfWMoypM+4zCA5SdVra5oE+/K6ISJ45lQcGoamKi+QnyzFD386CvdvI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q6tigibK; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q6tigibK" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a8d51a7d6f5so650984866b.2 for ; Mon, 07 Oct 2024 03:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728296534; x=1728901334; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ctN3kFXtEab/9LDOkVLTIjtt6yFxxpUk12K9MVkmLnA=; b=Q6tigibKswm9hHStxYPeZXDk/rXFGsw6gqY/llGBZYjTHYsSyjiWq4Xyz+3PnbBw74 Qc7DNJjitGf8utF1OyNXyGbh+LQRQKE9Spiek9kXWTD01Dh6xMaLzHsWFzQTyBbdBz1F v31uJfHU/lQGwowkzPPpQlILrFqbGEHRUM4PxjrSJfPfmFUQOQcrbomW4vPcNGxPBvTW 7EsyzEAMZ8ac2LZRg38PZ7Z7gFy+8DEhja1BvinOAXZ7JvNdEkg1E68vEz9XRlJGIg98 dNhlPOtMLUs/zSGmlf66+10qAAwd12hbccX94xtqQNoN/3FJ9z4otzDEDia78Bi/4pX9 KFrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728296534; x=1728901334; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ctN3kFXtEab/9LDOkVLTIjtt6yFxxpUk12K9MVkmLnA=; b=lIAJ30gM0BGJ4oxeQ27+eZONLSvHSqQwzhTa6C0QK8J+EX92eTRmGwGcjJ7KoGmPnM gPvqb/deucCaaKj8EvjF5lD+/9kfSlRyH7VHv+CslDOcq7ubXsp/ykrGl0w7XW+a6lm4 GPKeKD8hr59a8wLoAC2y0pHqC/Ge0XqXyMNE/8knqEUw4KveTcphu8WZFvxq4XL682cj mC6dWlxd/0ZTNjp/mXkjlGw7nM40XlKUnJSb8oTtq48pZCVu9zxOGqPbAVLVQA6SRpED rh6KKjVnrVmhoqWMETW9UVv5+mFhlmhc3+x1DUjcu44q/S5nOqMPpljtb8XYk3HEE87N Je8Q== X-Gm-Message-State: AOJu0YzevKDq8B8PM2+deLreVLbp/st0bht9YABzlJ5L1o4uJBjzdzNP y5cMFsFBZAPIbTUQsAEe2A2L6SVfFuJC3ANw0JZG953IxYm7SHU8HnuYjw== X-Google-Smtp-Source: AGHT+IHciFk6wB9sdW/JvxBLK4otVl2zRDKoKjeOB41BgAip5dQUGVl4kkAAAysvgRWQ+rW5FvrXtg== X-Received: by 2002:a17:907:7f89:b0:a99:435c:89f2 with SMTP id a640c23a62f3a-a99435c8ce0mr667202266b.63.1728296534405; Mon, 07 Oct 2024 03:22:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a992e7d4d9csm363722566b.182.2024.10.07.03.22.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 03:22:14 -0700 (PDT) Message-Id: <864b00997b725dbd7f3bea06391570df7d428f3b.1728296531.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 07 Oct 2024 10:22:11 +0000 Subject: [PATCH v4 2/2] [Outreachy][Patch v1] t3404: employing test_line_count() to replace test Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Usman Akinyemi , Usman Akinyemi From: Usman Akinyemi From: Usman Akinyemi Refactor t3404 to replace instances of `test` with `test_line_count()` for checking line counts. This improves readability and aligns with Git's current test practices. Signed-off-by: Usman Akinyemi removed test --- t/t3404-rebase-interactive.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 96a65783c47..81f984f4cf5 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -281,7 +281,8 @@ test_expect_success 'stop on conflicting pick' ' test_cmp expect2 file1 && test "$(git diff --name-status | sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 && - test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) && + grep -v "^#" < .git/rebase-merge/done > actual && + test_line_count = 4 actual && test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo) ' @@ -401,8 +402,8 @@ test_expect_success 'multi-squash only fires up editor once' ' ) && test $base = $(git rev-parse HEAD^) && git show >output && - count=$(grep ONCE output | wc -l) && - test 1 = $count + grep ONCE output >actual && + test_line_count = 1 actual ' test_expect_success 'multi-fixup does not fire up editor' ' @@ -416,8 +417,7 @@ test_expect_success 'multi-fixup does not fire up editor' ' ) && test $base = $(git rev-parse HEAD^) && git show >output && - count=$(grep NEVER output | wc -l) && - test 0 = $count && + ! grep NEVER output && git checkout @{-1} && git branch -D multi-fixup ' @@ -436,8 +436,8 @@ test_expect_success 'commit message used after conflict' ' ) && test $base = $(git rev-parse HEAD^) && git show >output && - count=$(grep ONCE output | wc -l) && - test 1 = $count && + grep ONCE output >actual && + test_line_count = 1 actual && git checkout @{-1} && git branch -D conflict-fixup ' @@ -456,8 +456,8 @@ test_expect_success 'commit message retained after conflict' ' ) && test $base = $(git rev-parse HEAD^) && git show >output && - count=$(grep TWICE output | wc -l) && - test 2 = $count && + grep TWICE output >actual && + test_line_count = 2 actual && git checkout @{-1} && git branch -D conflict-squash ' @@ -501,8 +501,8 @@ test_expect_success 'squash ignores comments' ' ) && test $base = $(git rev-parse HEAD^) && git show >output && - count=$(grep ONCE output | wc -l) && - test 1 = $count && + grep ONCE output >actual && + test_line_count = 1 actual && git checkout @{-1} && git branch -D skip-comments ' @@ -519,8 +519,8 @@ test_expect_success 'squash ignores blank lines' ' ) && test $base = $(git rev-parse HEAD^) && git show >output && - count=$(grep ONCE output | wc -l) && - test 1 = $count && + grep ONCE output >actual && + test_line_count = 1 actual && git checkout @{-1} && git branch -D skip-blank-lines '