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
'
}