Merge branch 'mz/oneway-merge-wo-u-no-lstat'

diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index b3195c47070b35d555f8cfae90497a2d00d10ca7..13c88c9aae7f7177cbff278cf5e587f86acb11e7 100755 (executable)
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -40,8 +40,8 @@ extra1    line above used to cause a segfault but no longer does
 EOF
 
 test_expect_success 'test --parseopt help output' '
-       git rev-parse --parseopt -- -h > output < optionspec
-       test_cmp expect output
+       test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
+       test_i18ncmp expect output
 '
 
 cat > expect <<EOF