Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / t / t3432-rebase-fast-forward.sh

diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 6f0452c0eac516796e27c5689b2e091c2b21b8ce..a29eda87e9a1265bcddd300628bf43f4167e47e3 100755 (executable)
--- a/t/t3432-rebase-fast-forward.sh
+++ b/t/t3432-rebase-fast-forward.sh
@@ -60,15 +60,16 @@ test_rebase_same_head_ () {
                fi &&
                oldhead=\$(git rev-parse HEAD) &&
                test_when_finished 'git reset --hard \$oldhead' &&
-               cp .git/logs/HEAD expect &&
+               git reflog HEAD >expect &&
                git rebase$flag $* >stdout &&
+               git reflog HEAD >actual &&
                if test $what = work
                then
                        old=\$(wc -l <expect) &&
-                       test_line_count '-gt' \$old .git/logs/HEAD
+                       test_line_count '-gt' \$old actual
                elif test $what = noop
                then
-                       test_cmp expect .git/logs/HEAD
+                       test_cmp expect actual
                fi &&
                newhead=\$(git rev-parse HEAD) &&
                if test $cmp = same