From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v2 0/1] t3420 remove progress from output
Date: Thu, 04 Jul 2019 02:47:01 -0700 (PDT) [thread overview]
Message-ID: <pull.276.v2.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.276.git.gitgitgadget@gmail.com>
Remove ugliness in the tests that check the output of git rebase
I've updated this to avoid repeated calls to printf as suggested by Junio
Based-On: sg/rebase-progress
Phillip Wood (1):
t3420: remove progress lines before comparing output
t/t3420-rebase-autostash.sh | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
base-commit: 5b12e3123b7b70e3875404a4ffe571ca079364fe
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-276%2Fphillipwood%2Fwip%2Ft3420-remove-progress-from-output-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-276/phillipwood/wip/t3420-remove-progress-from-output-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/276
Range-diff vs v1:
1: 52501623f6 ! 1: e1b4023bc0 t3420: remove progress lines before comparing output
@@ -20,6 +20,16 @@
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
+@@
+ echo conflicting-change >file2 &&
+ git add . &&
+ test_tick &&
+- git commit -m "related commit"
++ git commit -m "related commit" &&
++ remove_progress_re="$(printf "s/.*\\r//")"
+ '
+
+ create_expected_success_am () {
@@
q_to_cr >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
@@ -53,7 +63,7 @@
fi &&
create_expected_success_$suffix &&
- test_i18ncmp expected actual
-+ sed "$(printf "s/.*\\r//")" <actual >actual2 &&
++ sed "$remove_progress_re" <actual >actual2 &&
+ test_i18ncmp expected actual2
'
@@ -63,7 +73,7 @@
fi &&
create_expected_failure_$suffix &&
- test_i18ncmp expected actual
-+ sed "$(printf "s/.*\\r//")" <actual >actual2 &&
++ sed "$remove_progress_re" <actual >actual2 &&
+ test_i18ncmp expected actual2
'
}
--
gitgitgadget
next prev parent reply other threads:[~2019-07-04 9:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 13:11 [PATCH 0/1] t3420 remove progress from output Phillip Wood via GitGitGadget
2019-07-01 13:11 ` [PATCH 1/1] t3420: remove progress lines before comparing output Phillip Wood via GitGitGadget
2019-07-01 21:01 ` Junio C Hamano
2019-07-02 15:54 ` Phillip Wood
2019-07-02 17:23 ` Junio C Hamano
2019-07-04 9:53 ` Phillip Wood
2019-07-04 9:47 ` Phillip Wood via GitGitGadget [this message]
2019-07-04 9:47 ` [PATCH v2 " Phillip Wood 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.276.v2.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).