diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 2043bb8867cec2c2b4a431cca1f5762f10fa5ba5..2fcc31a6f3d346e533b697eecf853e219d174cd0 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
test_expect_success 'setup case sensitivity tests' '
echo case >one &&
test_tick &&
- git add one
+ git add one &&
git commit -a -m Second
'
test_commit octopus-b &&
git checkout master &&
test_commit seventh &&
- git merge octopus-a octopus-b
+ git merge octopus-a octopus-b &&
git merge reach
'
'
test_expect_success 'log.decorate configuration' '
- git config --unset-all log.decorate || :
+ test_might_fail git config --unset-all log.decorate &&
git log --oneline >expect.none &&
git log --oneline --decorate >expect.short &&