From 43ea081235dfebdd34ad16e873105dabdec075fb Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 11 Nov 2012 15:35:54 +0100 Subject: [PATCH] completion: standardize final space marker in tests The rest of the code uses ' Z$'. Lets use that for test_completion_long() as well. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- t/t9902-completion.sh | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 5c06709ea0..9778a1b94d 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -66,11 +66,10 @@ test_completion () } # Like test_completion, but reads expectation from stdin, -# which is convenient when it is multiline. We also process "_" into -# spaces to make test vectors more readable. +# which is convenient when it is multiline. test_completion_long () { - tr _ " " >expected && + sed -e 's/Z$//' >expected && test_completion "$1" } @@ -252,24 +251,24 @@ test_expect_success 'setup for ref completion' ' test_expect_success 'checkout completes ref names' ' test_completion_long "git checkout m" <<-\EOF - master_ - mybranch_ - mytag_ + master Z + mybranch Z + mytag Z EOF ' test_expect_success 'show completes all refs' ' test_completion_long "git show m" <<-\EOF - master_ - mybranch_ - mytag_ + master Z + mybranch Z + mytag Z EOF ' test_expect_success ': completes paths' ' test_completion_long "git show mytag:f" <<-\EOF - file1_ - file2_ + file1 Z + file2 Z EOF ' @@ -278,7 +277,7 @@ test_expect_success 'complete tree filename with spaces' ' git add . && git commit -m spaces && test_completion_long "git show HEAD:nam" <<-\EOF - name with spaces_ + name with spaces Z EOF ' @@ -287,8 +286,8 @@ test_expect_failure 'complete tree filename with metacharacters' ' git add . && git commit -m meta && test_completion_long "git show HEAD:nam" <<-\EOF - name with ${meta}_ - name with spaces_ + name with ${meta} Z + name with spaces Z EOF ' -- 2.11.4.GIT