merge-octopus: abort if index does not match HEAD

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index f5239b525aef9e85b8bcc295be02aa42a7155968..c7e58b69a92fb464059f99ad298b9147946bf702 100755 (executable)
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -124,7 +124,7 @@ test_expect_success 'test diff.renames=false' '
 
 test_expect_success 'test diff.renames unset' '
        git diff --cached $tree >current &&
-       compare_diff_patch current no-rename
+       compare_diff_patch current expected
 '
 
 test_expect_success 'favour same basenames over different ones' '