X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4202-log.sh;h=2fcc31a6f3d346e533b697eecf853e219d174cd0;hb=a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707;hp=2043bb8867cec2c2b4a431cca1f5762f10fa5ba5;hpb=37ad7ca7dbb0bef2b902f6bc7d3346ddff1667a5;p=git.git diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 2043bb886..2fcc31a6f 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -191,7 +191,7 @@ test_expect_success 'git show leaves list of commits as given' ' test_expect_success 'setup case sensitivity tests' ' echo case >one && test_tick && - git add one + git add one && git commit -a -m Second ' @@ -341,7 +341,7 @@ test_expect_success 'set up more tangled history' ' 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 ' @@ -393,7 +393,7 @@ test_expect_success 'log --graph with merge' ' ' 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 &&