Merge branch 'dl/merge-cleanup-scissors-fix'

diff --git a/t/perf/p0001-rev-list.sh b/t/perf/p0001-rev-list.sh
index ebf172401b0ff9c280ad14991323bd8aaf85b5e0..3042a85666ce14f1f30777ddbeb3e87c7a9bb7ce 100755 (executable)
--- a/t/perf/p0001-rev-list.sh
+++ b/t/perf/p0001-rev-list.sh
@@ -14,6 +14,24 @@ test_perf 'rev-list --all --objects' '
        git rev-list --all --objects >/dev/null
 '
 
+test_perf 'rev-list --parents' '
+       git rev-list --parents HEAD >/dev/null
+'
+
+test_expect_success 'create dummy file' '
+       echo unlikely-to-already-be-there >dummy &&
+       git add dummy &&
+       git commit -m dummy
+'
+
+test_perf 'rev-list -- dummy' '
+       git rev-list HEAD -- dummy
+'
+
+test_perf 'rev-list --parents -- dummy' '
+       git rev-list --parents HEAD -- dummy
+'
+
 test_expect_success 'create new unreferenced commit' '
        commit=$(git commit-tree HEAD^{tree} -p HEAD) &&
        test_export commit