Merge branch 'hv/submodule-find-ff-merge'

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 13fdeb2653ce421c298b07ea866a431d8974e9b7..cdb70b4b3356eeb45bb6e5ac62d1f82eb6b3ccdc 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -79,7 +79,7 @@ test_expect_success 'pretty format' '
        test_cmp expect log.predictable
 '
 
-test_expect_failure '--abbrev' '
+test_expect_success '--abbrev' '
        sed s/SUBJECT/OBJID/ expect.template >expect &&
        git shortlog --format="%h" --abbrev=5 HEAD >log &&
        fuzz log >log.predictable &&