[PATCH] t5510: become resilient to GETTEXT_POISON
- From
Vasco Almeida <vascomalmeida@sapo.pt>
- Date
- Jul 25, 2016, 09:31 UTC
- Message-ID
- <1469439068-2724-1-git-send-email-vascomalmeida@sapo.pt>
Replace gettext poison text with appropriate values to be able to cut the right output of git fetch command for comparison.
The first gettext poison falls from the previous line into the next because the poison does not add a newline, so we must replace it with nothing.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> --- t/t5510-fetch.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 6bd4853..b261223 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -694,7 +694,10 @@ test_expect_success 'fetch aligned output' ' ( cd full-output && git -c fetch.output=full fetch origin 2>&1 | \ - grep -e "->" | cut -c 22- >../actual + grep -e "->" | \ + sed -e "/master/ s/# GETTEXT POISON #//" \ + -e "/tag/ s/# GETTEXT POISON #/[new tag] /" | \ + cut -c 22- >../actual ) && cat >expect <<-\EOF && master -> origin/master @@ -709,7 +712,10 @@ test_expect_success 'fetch compact output' ' ( cd compact && git -c fetch.output=compact fetch origin 2>&1 | \ - grep -e "->" | cut -c 22- >../actual + grep -e "->" | \ + sed -e "/master/ s/# GETTEXT POISON #//" \ + -e "/extraa/ s/# GETTEXT POISON #/[new tag] /" | \ + cut -c 22- >../actual ) && cat >expect <<-\EOF && master -> origin/*
-- 2.7.4