Merge branch 'jk/describe-omit-some-refs' into maint

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index dd37ac47c5e16bc8df39bcc14e1a2861ab556374..9d707d2a40a457abcd85fb93d9f8195946d09d01 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -166,10 +166,9 @@ test_expect_success 'resulting reflog can be shown by log -g' '
        oid=$(git rev-parse HEAD) &&
        cat >expect <<-EOF &&
        HEAD@{0} $oid $msg
-       HEAD@{1} $oid $msg
        HEAD@{2} $oid checkout: moving from foo to baz
        EOF
-       git log -g --format="%gd %H %gs" -3 HEAD >actual &&
+       git log -g --format="%gd %H %gs" -2 HEAD >actual &&
        test_cmp expect actual
 '