From: "Usman Akinyemi via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Usman Akinyemi <usmanakinyemi202@gmail.com>,
Usman Akinyemi <usmanakinyemi202@gmail.com>
Subject: [PATCH 2/2] [Outreachy][Patch v2] t3404: avoid losing exit status to pipes
Date: Sun, 06 Oct 2024 05:33:34 +0000 [thread overview]
Message-ID: <4199434bd6ef2142192d1c720ccd877b1a80536b.1728192815.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1805.git.git.1728192814.gitgitgadget@gmail.com>
From: Usman Akinyemi <usmanakinyemi202@gmail.com>
Changes since v1:
- Added "tr -d '[:space:]'" to handle whitespace on macOS
Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
---
t/t3404-rebase-interactive.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 33ea1f05e2c..3d8de69d6ee 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -401,7 +401,7 @@ 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) &&
+ count=$(grep ONCE output | wc -l | tr -d '[:space:]') &&
test 1 = "$count"
'
@@ -416,7 +416,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) &&
+ count=$(grep NEVER output | wc -l | tr -d '[:space:]') &&
test 0 = "$count" &&
git checkout @{-1} &&
git branch -D multi-fixup
@@ -436,7 +436,7 @@ test_expect_success 'commit message used after conflict' '
) &&
test $base = $(git rev-parse HEAD^) &&
git show >output &&
- count=$(grep ONCE output | wc -l) &&
+ count=$(grep ONCE output | wc -l | tr -d '[:space:]') &&
test 1 = "$count" &&
git checkout @{-1} &&
git branch -D conflict-fixup
@@ -456,7 +456,7 @@ test_expect_success 'commit message retained after conflict' '
) &&
test $base = $(git rev-parse HEAD^) &&
git show >output &&
- count=$(grep TWICE output | wc -l) &&
+ count=$(grep TWICE output | wc -l | tr -d '[:space:]') &&
test 2 = "$count" &&
git checkout @{-1} &&
git branch -D conflict-squash
@@ -501,7 +501,7 @@ test_expect_success 'squash ignores comments' '
) &&
test $base = $(git rev-parse HEAD^) &&
git show >output &&
- count=$(grep ONCE output | wc -l) &&
+ count=$(grep ONCE output | wc -l | tr -d '[:space:]') &&
test 1 = "$count" &&
git checkout @{-1} &&
git branch -D skip-comments
@@ -519,7 +519,7 @@ test_expect_success 'squash ignores blank lines' '
) &&
test $base = $(git rev-parse HEAD^) &&
git show >output &&
- count=$(grep ONCE output | wc -l) &&
+ count=$(grep ONCE output | wc -l | tr -d '[:space:]') &&
test 1 = "$count" &&
git checkout @{-1} &&
git branch -D skip-blank-lines
--
gitgitgadget
next prev parent reply other threads:[~2024-10-06 5:33 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-06 5:33 [PATCH 0/2] [Outreachy][Patch v2] t3404: avoid losing exit status to pipes Usman Akinyemi via GitGitGadget
2024-10-06 5:33 ` [PATCH 1/2] [Outreachy][Patch v1] " Usman Akinyemi via GitGitGadget
2024-10-06 5:55 ` Eric Sunshine
2024-10-06 6:31 ` Usman Akinyemi
2024-10-06 5:33 ` Usman Akinyemi via GitGitGadget [this message]
2024-10-06 5:48 ` [PATCH 2/2] [Outreachy][Patch v2] " Eric Sunshine
2024-10-06 6:30 ` Usman Akinyemi
2024-10-06 7:28 ` Eric Sunshine
2024-10-06 8:26 ` Usman Akinyemi
2024-10-06 8:31 ` [PATCH v2] [Outreachy][Patch v1] " Usman Akinyemi via GitGitGadget
2024-10-06 9:19 ` Eric Sunshine
2024-10-06 9:32 ` Usman Akinyemi
2024-10-06 10:21 ` Eric Sunshine
2024-10-06 11:12 ` shejialuo
2024-10-06 12:06 ` Eric Sunshine
2024-10-06 12:28 ` Usman Akinyemi
2024-10-06 13:03 ` shejialuo
2024-10-06 13:27 ` Usman Akinyemi
2024-10-06 13:36 ` shejialuo
2024-10-06 12:29 ` shejialuo
2024-10-06 12:46 ` Usman Akinyemi
2024-10-07 4:19 ` Eric Sunshine
2024-10-06 16:06 ` [PATCH v3 0/2] [Outreachy][Patch v2] " Usman Akinyemi via GitGitGadget
2024-10-06 16:06 ` [PATCH v3 1/2] t3404: avoid losing exit status with focus on `git show` and `git cat-files` Usman Akinyemi via GitGitGadget
2024-10-07 6:04 ` Patrick Steinhardt
2024-10-07 8:52 ` phillip.wood123
2024-10-07 9:05 ` Usman Akinyemi
2024-10-06 16:06 ` [PATCH v3 2/2] [Outreachy][Patch v1] t3404: employing test_line_count() to replace test Usman Akinyemi via GitGitGadget
2024-10-06 16:31 ` Kristoffer Haugsbakk
2024-10-07 4:38 ` Eric Sunshine
2024-10-07 6:05 ` Patrick Steinhardt
2024-10-07 7:32 ` Usman Akinyemi
2024-10-07 9:00 ` phillip.wood123
2024-10-06 16:18 ` [PATCH v3 0/2] [Outreachy][Patch v2] t3404: avoid losing exit status to pipes Usman Akinyemi
2024-10-07 4:24 ` Eric Sunshine
2024-10-07 7:25 ` Usman Akinyemi
2024-10-07 8:08 ` Patrick Steinhardt
2024-10-07 8:11 ` Eric Sunshine
2024-10-07 9:01 ` Usman Akinyemi
2024-10-06 16:21 ` Kristoffer Haugsbakk
2024-10-06 16:26 ` Usman Akinyemi
2024-10-07 5:55 ` Patrick Steinhardt
2024-10-07 10:22 ` [PATCH v4 " Usman Akinyemi via GitGitGadget
2024-10-07 10:22 ` [PATCH v4 1/2] t3404: avoid losing exit status with focus on `git show` and `git cat-file` Usman Akinyemi via GitGitGadget
2024-10-07 10:22 ` [PATCH v4 2/2] [Outreachy][Patch v1] t3404: employing test_line_count() to replace test Usman Akinyemi via GitGitGadget
2024-10-07 10:28 ` Patrick Steinhardt
2024-10-07 10:51 ` [PATCH v5 0/2] [Outreachy][Patch v2] t3404: avoid losing exit status to pipes Usman Akinyemi via GitGitGadget
2024-10-07 10:51 ` [PATCH v5 1/2] t3404: avoid losing exit status with focus on `git show` and `git cat-file` Usman Akinyemi via GitGitGadget
2024-10-07 10:51 ` [PATCH v5 2/2] t3404: employing test_line_count() to replace test Usman Akinyemi via GitGitGadget
2024-10-07 10:54 ` Patrick Steinhardt
2024-10-07 11:10 ` Usman Akinyemi
2024-10-07 11:11 ` [PATCH v6 0/2] [Outreachy][Patch v2] t3404: avoid losing exit status to pipes Usman Akinyemi via GitGitGadget
2024-10-07 11:11 ` [PATCH v6 1/2] t3404: avoid losing exit status with focus on `git show` and `git cat-file` Usman Akinyemi via GitGitGadget
2024-10-07 11:11 ` [PATCH v6 2/2] t3404: employing test_line_count() to replace test Usman Akinyemi via GitGitGadget
2024-10-07 15:07 ` Phillip Wood
2024-10-07 15:32 ` Usman Akinyemi
2024-10-07 11:12 ` [PATCH v6 0/2] [Outreachy][Patch v2] t3404: avoid losing exit status to pipes Patrick Steinhardt
2024-10-07 11:16 ` Usman Akinyemi
2024-10-07 11:32 ` Patrick Steinhardt
2024-10-07 11:44 ` Usman Akinyemi
2024-10-07 15:32 ` [PATCH v7 " Usman Akinyemi via GitGitGadget
2024-10-07 15:32 ` [PATCH v7 1/2] t3404: avoid losing exit status with focus on `git show` and `git cat-file` Usman Akinyemi via GitGitGadget
2024-10-07 15:32 ` [PATCH v7 2/2] t3404: replace test with test_line_count() Usman Akinyemi via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4199434bd6ef2142192d1c720ccd877b1a80536b.1728192815.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=usmanakinyemi202@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).