notes-merge: switch to use the_hash_algo

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 7e8d5bb200e35ef46a48cae3ebd423f312022bce..460d0523be6f35e4477a010edd365c1f8fbd431c 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -59,7 +59,7 @@ test_expect_success 'rebase against master' '
        git rebase master
 '
 
-test_expect_failure 'rebase sets ORIG_HEAD to pre-rebase state' '
+test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
        git checkout -b orig-head topic &&
        pre="$(git rev-parse --verify HEAD)" &&
        git rebase master &&