packfile: add repository argument to cache_or_unpack_entry

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 09943d6a9bb4580bbdd8f892380fdeaa0d8972da..72d9564747adf2d37ea2e61a6d2e479096fe6508 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -306,7 +306,8 @@ test_expect_success 'rebase--merge.sh and --show-current-patch' '
                test_must_fail git rebase --merge --onto init HEAD^ &&
                git rebase --show-current-patch >actual.patch &&
                GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-               grep "show.*$(git rev-parse two)" stderr
+               grep "show.*REBASE_HEAD" stderr &&
+               test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
        )
 '