merge-recursive: When we detect we can skip an update, actually skip it

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 6b3e8b8d4bfb8676bef52ace744f59c681120f01..7d955c1e12289dc22f594f97ab04b5d8bb2a0d9e 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -728,7 +728,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
        git commit -m "Random, unrelated changes"
 '
 
-test_expect_failure 'avoid unnecessary update, normal rename' '
+test_expect_success 'avoid unnecessary update, normal rename' '
        git checkout -q avoid-unnecessary-update-1^0 &&
        test-chmtime =1000000000 rename &&
        test-chmtime -v +0 rename >expect &&