merge-octopus: abort if index does not match HEAD

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index f5f18b7d21c00da258125a9125a46b32cf9e8504..2142c1fa92017bc47cfc4ccb1f25e16fc0eec1a4 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -672,7 +672,7 @@ test_expect_success 'store updates stash ref and reflog' '
        ! grep quux bazzy &&
        git stash store -m quuxery $STASH_ID &&
        test $(cat .git/refs/stash) = $STASH_ID &&
-       grep $STASH_ID .git/logs/refs/stash &&
+       git reflog --format=%H stash| grep $STASH_ID &&
        git stash pop &&
        grep quux bazzy
 '