[PATCH v3 18/35] userdiff tests: remove hack for "RIGHT" token
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 24, 2021, 19:51 UTC
- Message-ID
- <20210224195129.4004-19-avarab@gmail.com>
- In-Reply-To
- <20210215154427.32693-1-avarab@gmail.com>
Now that the "RIGHT" token isn't how we select the desired hunk header line in the test anymore we can revert a hack added in f1b75fbaf1 (t4018: convert custom pattern test to the new infrastructure, 2014-03-21) and go back to the regular expression we were testing before that change.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t4018/custom.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t4018/custom.sh b/t/t4018/custom.sh index 59d855c01c5..b208a771d28 100755 --- a/t/t4018/custom.sh +++ b/t/t4018/custom.sh @@ -33,14 +33,14 @@ public class Beer EOF_TEST test_expect_success 'custom: setup match to end of line' ' - git config diff.custom.funcname "......Beer\$" + git config diff.custom.funcname "Beer\$" ' test_diff_funcname 'custom: match to end of line' \ 8<<\EOF_HUNK 9<<\EOF_TEST -RIGHT_Beer +Beer EOF_HUNK -public class RIGHT_Beer +public class Beer { int special; public static void main(String args[])
-- 2.30.0.284.gd98b1dd5eaa7