Merge branch 'jt/diff-color-move-fix' into next

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index afa03f3b65afd3aea22b967d82a8c4455e7b8808..9128ec5acda3b4b2f568dee50169046a333c4527 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -201,7 +201,7 @@ test_expect_success TTY 'git tag -a respects --paginate' '
        test -e paginated.out
 '
 
-test_expect_failure TTY 'git tag as alias ignores pager.tag with -a' '
+test_expect_success TTY 'git tag as alias ignores pager.tag with -a' '
        test_when_finished "git tag -d newtag" &&
        rm -f paginated.out &&
        test_terminal git -c pager.tag -c alias.t=tag t -am message newtag &&